Skip to content
Snippets Groups Projects
Commit bd605106 authored by Stefan Schmidt's avatar Stefan Schmidt
Browse files

Merge branch 'mrfrank/timeout-increment' into 'kirkstone' 

openharmony-standard: reintroduce patches to increment timeouts

See merge request eclipse/oniro-oh/meta-openharmony!120
parents ff3f528c 4409ec79
No related branches found
No related tags found
1 merge request!120openharmony-standard: reintroduce patches to increment timeouts
Pipeline #16932 passed
Stage: fetch
    Stage: build
      Stage: test
        Hide whitespace changes
        Inline Side-by-side
        recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-start-ability-timeout-increment.patch 0 → 100644
        + 41
        − 0
        View file @ bd605106
        # 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;
        recipes-openharmony/openharmony/openharmony-standard-3.0/test-xts-acts-testcase-timeout-increment.patch 0 → 100644
        + 86
        − 0
        View file @ bd605106
        # 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 20 seconds.
        Apply to test/xts/acts
        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 = 20000
        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 = 20000
        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 = 20000
        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 = 20000
        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 = 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')
        recipes-openharmony/openharmony/openharmony-standard_3.0.bb
        + 2
        − 0
        View file @ bd605106
        ......@@ -97,6 +97,8 @@ SRC_URI += "file://foundation_distributedschedule_safwk-slash-system-symlink.pat
        SRC_URI += "file://appdatamgr-IsColumnNull-initialize-result.patch;patchdir=${S}/foundation/distributeddatamgr/appdatamgr"
        SRC_URI += "file://InnerBundleInfo-initialize-installationFree.patch;patchdir=${S}/foundation/appexecfwk/standard"
        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"
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment

        Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent