From: Mukesh Rana <106960543+mukesh-lt@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:40:46 +0000 (+0530) Subject: Fixes to increase stability (#38511) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97b6cbcbfd5600b75e0368e9e1e5674776bca940;p=thirdparty%2Fbootstrap.git Fixes to increase stability (#38511) Co-authored-by: Akshat Rustagi --- diff --git a/js/tests/browsers.js b/js/tests/browsers.js index 0e48e83a73..645b9c895a 100644 --- a/js/tests/browsers.js +++ b/js/tests/browsers.js @@ -125,25 +125,25 @@ const browsers = { platformName: 'Windows 10' } }, - iphone11: { + ios15: { platformName: 'ios', platformVersion: '15', browserName: 'Safari', - deviceName: 'iPhone 13', + deviceName: 'iPhone.*', isRealMobile: true }, - iphone14: { + ios16: { platformName: 'ios', platformVersion: '16', browserName: 'Safari', - deviceName: 'iPhone 14', + deviceName: 'iPhone.*', isRealMobile: true }, - pixel6: { + android12: { platformName: 'android', platformVersion: '12', browserName: 'Chrome', - deviceName: 'Pixel 6', + deviceName: 'Pixel.*', isRealMobile: true } } diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index 676470e5ad..624897dad8 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -69,12 +69,13 @@ const config = { captureTimeout: 180_000, browserDisconnectTolerance: 3, browserDisconnectTimeout: 180_000, - browserNoActivityTimeout: 180_000, + browserNoActivityTimeout: 400_000, + retryLimit: 3, concurrency: 5, client: { clearContext: false, jasmine: { - timeoutInterval: 20_000 + timeoutInterval: 180_000 } }, files: [ @@ -119,6 +120,7 @@ const config = { if (LAMBDATEST) { config.hostname = 'localhost.lambdatest.com' + config.captureTimeout = 600_000 for (const key of Object.keys(browsers.lambdaTest)) { browsers.lambdaTest[key].base = 'WebDriver' @@ -144,8 +146,6 @@ if (LAMBDATEST) { browsers.lambdaTest[key]['LT:Options'].tunnelName = ENV.LT_TUNNEL_NAME || 'jasmine' browsers.lambdaTest[key]['LT:Options'].pseudoActivityInterval = 5000 // 5000 ms heartbeat } - - browsers.lambdaTest[key].retryLimit = 3 } plugins.push('karma-webdriver-launcher', 'karma-jasmine-html-reporter') @@ -158,8 +158,7 @@ if (LAMBDATEST) { username: ENV.BROWSER_STACK_USERNAME, accessKey: ENV.BROWSER_STACK_ACCESS_KEY, build: `bootstrap-${ENV.GITHUB_SHA ? `${ENV.GITHUB_SHA.slice(0, 7)}-` : ''}${new Date().toISOString()}`, - project: 'Bootstrap', - retryLimit: 3 + project: 'Bootstrap' } plugins.push('karma-browserstack-launcher', 'karma-jasmine-html-reporter') config.customLaunchers = browsers.browserStack