From 85a8464df0eb0ee0bab2f6a0c0f3994609c781d9 Mon Sep 17 00:00:00 2001 From: y00314596 Date: Mon, 22 Nov 2021 15:07:10 +0800 Subject: [PATCH] fixed be7a317 from https://gitee.com/yangqing3/xts_acts/pulls/1126 modify on 20211122 by yangqing3@huawei.com Signed-off-by: y00314596 --- global/i18n_standard/intljs/Test.json | 2 +- .../i18n_standard/intljs/src/main/js/default/test/Intl.test.js | 2 +- global/resmgr_standard/resmgrjs/Test.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global/i18n_standard/intljs/Test.json b/global/i18n_standard/intljs/Test.json index 086a1528f..27be91538 100755 --- a/global/i18n_standard/intljs/Test.json +++ b/global/i18n_standard/intljs/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for intljs Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "120000", + "test-timeout": "300000", "package": "ohos.intl.test", "shell-timeout": "60000" }, diff --git a/global/i18n_standard/intljs/src/main/js/default/test/Intl.test.js b/global/i18n_standard/intljs/src/main/js/default/test/Intl.test.js index 429f5fb71..ec1009098 100644 --- a/global/i18n_standard/intljs/src/main/js/default/test/Intl.test.js +++ b/global/i18n_standard/intljs/src/main/js/default/test/Intl.test.js @@ -101,7 +101,7 @@ describe('intlTest', function () { * @tc.desc check the calendar */ it('locale_test_0800', 0, function () { - let locale = new Intl.Locale('zh-CN', {hourCycle: '24', calendar: 'gregory'}); + let locale = new Intl.Locale('zh-CN', {hourCycle: 'h24', calendar: 'gregory'}); console.log('locale_test_0800 ' + locale.calendar); expect(locale.calendar).assertEqual('gregory'); }) diff --git a/global/resmgr_standard/resmgrjs/Test.json b/global/resmgr_standard/resmgrjs/Test.json index eaa38a7e3..83eb3c65e 100755 --- a/global/resmgr_standard/resmgrjs/Test.json +++ b/global/resmgr_standard/resmgrjs/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for resmgrjs Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "60000", + "test-timeout": "300000", "package": "ohos.resmgr.test", "shell-timeout": "60000" }, -- GitLab