From a71a46b42574cf92b51e1d9fa4feacae75127d46 Mon Sep 17 00:00:00 2001 From: Francesco Pham <francesco.pham@huawei.com> Date: Mon, 6 Feb 2023 14:34:32 +0100 Subject: [PATCH] openharmony-standard-3.0: add patch to increment test timeout The default test timeout is 5000ms which is too short, causing some testcases to exceed timeout. Increasing the timeout to 60 seconds. Signed-off-by: Francesco Pham <francesco.pham@huawei.com> --- .../test-xts-acts-timeout-increment.patch | 71 +++++++++++++++++++ .../openharmony/openharmony-standard_3.0.bb | 1 + 2 files changed, 72 insertions(+) create mode 100644 recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-timeout-increment.patch diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-timeout-increment.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-timeout-increment.patch new file mode 100644 index 00000000..7aea6245 --- /dev/null +++ b/recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-timeout-increment.patch @@ -0,0 +1,71 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +The default test timeout is 5000ms which is too short, causing some testcases +to exceed timeout. Increasing the timeout to 60 seconds. + +Upstream-Status: Pending + +Signed-off-by: Francesco Pham <francesco.pham@huawei.com> + +diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js +index 095743b34..ecffc80a9 100644 +--- a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js ++++ b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js +@@ -36,6 +36,7 @@ export default { + core.init() + + const configService = core.getDefaultService('config') ++ this.timeout = 60000 + configService.setConfig(this) + + require('../../../test/List.test') +diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/default/pages/index/index.js b/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/default/pages/index/index.js +index 362bbb390..2cec00ce8 100644 +--- a/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/default/pages/index/index.js ++++ b/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/default/pages/index/index.js +@@ -31,6 +31,7 @@ export default { + core.addService('expect', expectExtend) + core.init() + const configService = core.getDefaultService('config') ++ this.timeout = 60000 + configService.setConfig(this) + + require('../../../test/List.test') +diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/default/pages/index/index.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/default/pages/index/index.js +index 6bb4ad1c3..216571d89 100644 +--- a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/default/pages/index/index.js ++++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/default/pages/index/index.js +@@ -31,6 +31,7 @@ export default { + core.addService('expect', expectExtend) + core.init() + const configService = core.getDefaultService('config') ++ this.timeout = 60000 + configService.setConfig(this) + + require('../../../test/List.test.js') +diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js +index 9b47685ef..f06cde28f 100644 +--- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js ++++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js +@@ -32,6 +32,7 @@ export default { + core.addService('expect', expectExtend) + core.init() + const configService = core.getDefaultService('config') ++ this.timeout = 60000 + configService.setConfig(this) + + require('../../../test/List.test') +diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/default/pages/index/index.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/default/pages/index/index.js +index 398d8b4d7..31f6f45f6 100644 +--- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/default/pages/index/index.js ++++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/default/pages/index/index.js +@@ -31,6 +31,7 @@ export default { + core.addService('expect', expectExtend) + core.init() + const configService = core.getDefaultService('config') ++ this.timeout = 60000 + configService.setConfig(this) + + require('../../../test/List.test') diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb index 6f99180a..8d97f14b 100644 --- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb +++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb @@ -73,6 +73,7 @@ SRC_URI += "file://foundation_distributedschedule_safwk-slash-system-symlink.pat SRC_URI += "file://test-xts-acts-Start-tests-from-onInit.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://RenderText-PerformLayout-remove-sigsegv-code.patch;patchdir=${S}/foundation/ace/ace_engine" SRC_URI += "file://remove-root-uid-check.patch;patchdir=${S}/foundation/aafwk/standard" +SRC_URI += "file://test-xts-acts-timeout-increment.patch;patchdir=${S}/test/xts/acts" inherit python3native gn_base ptest -- GitLab