diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/start-ability-timeout-increment.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/start-ability-timeout-increment.patch deleted file mode 100644 index e22b5850410d3cc54c7bfabf44edf35aabcd2f91..0000000000000000000000000000000000000000 --- a/recipes-openharmony/openharmony/openharmony-standard-3.0/start-ability-timeout-increment.patch +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -START_ABILITY_TIMEOUT is 3000ms which is too short in our case, causing some -testcases in ActsBmsModuleUsageRecordTest to exceed timeout. -Increasing the timeout to 30 seconds. - -Upstream-Status: Pending - -Signed-off-by: Francesco Pham <francesco.pham@huawei.com> - -diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js -index d4068900a..1510b6608 100644 ---- a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js -+++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js -@@ -24,7 +24,7 @@ const BUNDLE_NAME = 'com.example.third1'; - const NUM_TWO = 2; - const NUM_TEN = 10; - const INVALID_NUM = -1; --const START_ABILITY_TIMEOUT = 3000; -+const START_ABILITY_TIMEOUT = 30000; - const START_RECORD = 900; - const TIMEOUT = 3000; - diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-start-ability-timeout-increment.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-start-ability-timeout-increment.patch new file mode 100644 index 0000000000000000000000000000000000000000..a8161e11d5f44ea3566b8e3331dd86bdfe1c6972 --- /dev/null +++ b/recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-start-ability-timeout-increment.patch @@ -0,0 +1,41 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +current START_ABILITY_TIMEOUT is too short, causing some +testcases in ActsBmsModuleUsageRecordTest and FeatureAbilityJsunit to +exceed timeout. +Increasing the timeout to 15 seconds. + +Apply to test/xts/acts + +Upstream-Status: Pending + +Signed-off-by: Francesco Pham <francesco.pham@huawei.com> + +diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +index b2a603467..50d9ac07d 100644 +--- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js ++++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +@@ -17,7 +17,7 @@ import wantconstant from '@ohos.ability.wantConstant' + import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' + import commonEvent from '@ohos.commonevent' + +-const START_ABILITY_TIMEOUT = 4000; ++const START_ABILITY_TIMEOUT = 15000; + const TERMINATE_ABILITY_TIMEOUT = 1000; + const TIMEOUT = 1000; + var subscriberInfo_ACTS_StartAbility_0100 = { +diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js +index d4068900a..1510b6608 100644 +--- a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js ++++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js +@@ -24,7 +24,7 @@ const BUNDLE_NAME = 'com.example.third1'; + const NUM_TWO = 2; + const NUM_TEN = 10; + const INVALID_NUM = -1; +-const START_ABILITY_TIMEOUT = 3000; ++const START_ABILITY_TIMEOUT = 15000; + const START_RECORD = 900; + const TIMEOUT = 3000; + 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-testcase-timeout-increment.patch similarity index 79% rename from recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-timeout-increment.patch rename to recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-testcase-timeout-increment.patch index 7aea6245dda780698f9baef3f53d20fae72717ce..1b3ae4c48fa04b7610148f81c9df4d5f0452a0d3 100644 --- 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-testcase-timeout-increment.patch @@ -3,7 +3,9 @@ # 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. +to exceed timeout. Increasing the timeout to 20 seconds. + +Apply to test/xts/acts Upstream-Status: Pending @@ -17,7 +19,7 @@ index 095743b34..ecffc80a9 100644 core.init() const configService = core.getDefaultService('config') -+ this.timeout = 60000 ++ this.timeout = 20000 configService.setConfig(this) require('../../../test/List.test') @@ -29,7 +31,7 @@ index 362bbb390..2cec00ce8 100644 core.addService('expect', expectExtend) core.init() const configService = core.getDefaultService('config') -+ this.timeout = 60000 ++ this.timeout = 20000 configService.setConfig(this) require('../../../test/List.test') @@ -41,7 +43,7 @@ index 6bb4ad1c3..216571d89 100644 core.addService('expect', expectExtend) core.init() const configService = core.getDefaultService('config') -+ this.timeout = 60000 ++ this.timeout = 20000 configService.setConfig(this) require('../../../test/List.test.js') @@ -53,7 +55,7 @@ index 9b47685ef..f06cde28f 100644 core.addService('expect', expectExtend) core.init() const configService = core.getDefaultService('config') -+ this.timeout = 60000 ++ this.timeout = 20000 configService.setConfig(this) require('../../../test/List.test') @@ -65,7 +67,20 @@ index 398d8b4d7..31f6f45f6 100644 core.addService('expect', expectExtend) core.init() const configService = core.getDefaultService('config') -+ this.timeout = 60000 ++ this.timeout = 20000 + configService.setConfig(this) + + require('../../../test/List.test') + +diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js +index 604c4fe49..c6acf358d 100644 +--- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js ++++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js +@@ -33,6 +33,7 @@ export default { + core.addService('expect', expectExtend) + core.init() + const configService = core.getDefaultService('config') ++ this.timeout = 20000 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 9e99e1796c4745fcf6d107b862e7ad0ec8f5fb69..1ba30ca1bd17eda3518df850441e2f3865c4d846 100644 --- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb +++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb @@ -73,8 +73,8 @@ SRC_URI += "file://base_hiviewdfx_hiview-libfaultlogger-static.patch;patchdir=${ SRC_URI += "file://foundation_distributedschedule_safwk-slash-system-symlink.patch;patchdir=${S}/foundation/distributedschedule/safwk" SRC_URI += "file://ParagraphTxt-ComputeLineBreaks-skip-sigsegv-code.patch;patchdir=${S}/third_party/flutter" -SRC_URI += "file://test-xts-acts-timeout-increment.patch;patchdir=${S}/test/xts/acts" -SRC_URI += "file://start-ability-timeout-increment.patch;patchdir=${S}/test/xts/acts" +SRC_URI += "file://test-xts-acts-testcase-timeout-increment.patch;patchdir=${S}/test/xts/acts" +SRC_URI += "file://test-xts-acts-start-ability-timeout-increment.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://test-xts-acts-fix-Defpermission-typo.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://test-xts-acts-fix-faultloggertest.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://test-xts-acts-fix-hicolliecpptest.patch;patchdir=${S}/test/xts/acts"