Skip to content

Commit d500a0d

Browse files
Disable firefox browserstack tests temporarily (#7935)
* Disable firefox browserstack tests temporarily * Remove unused WebGL scripts * Update test-ci.sh * Always use port 9876 for karma * Always use port 9200 for karma Browserstack supports ports 9200-9400 for safari testing (https://www.browserstack.com/question/39572), and when karma launches and its port is in use, it automatically increments the port. Starting at 9200 ensures the port is always supported by BrowserStack. * Fix bash npm-run-all script * Fix tfjs-vis test script * Update karma.conf.js * Update automl macos test version --------- Co-authored-by: Ping Yu <[email protected]>
1 parent 20ceb6f commit d500a0d

File tree

27 files changed

+51
-95
lines changed

27 files changed

+51
-95
lines changed

e2e/benchmarks/browserstack-benchmark/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function getBrowserStackConfig() {
2626
hostname: 'bs-local.com',
2727
plugins: ['karma-jasmine', 'karma-browserstack-launcher'],
2828
reporters: ['progress', 'BrowserStack'],
29-
port: 9812,
29+
port: 9200,
3030
browserStack: {
3131
username: process.env.BROWSERSTACK_USERNAME,
3232
accessKey: process.env.BROWSERSTACK_ACCESS_KEY,

e2e/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const browserstackConfig = {
108108
// breaks WASM file serving.
109109
// See https://www.browserstack.com/question/39574
110110
singleRun: true,
111-
port: 9876
111+
port: 9200
112112
};
113113

114114
const chromeWebgpuFlags = [

e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = function(config) {
4343
};
4444

4545
const browserstackConfig =
46-
{...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9811};
46+
{...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9200};
4747

4848
if (config.grep) {
4949
args.push('--grep', config.grep);

e2e/script_tag_tests/tfjs/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = function(config) {
3535
};
3636

3737
const browserstackConfig =
38-
{...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9811};
38+
{...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9200};
3939

4040
if (config.grep) {
4141
args.push('--grep', config.grep);

e2e/scripts/run-browserstack-tests.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ if [[ "$NIGHTLY" = true || "$RELEASE" = true ]]; then
3939
COMMANDS+=(
4040
"yarn run-browserstack --browsers=bs_ios_12 --tags '$TAGS' --testEnv webgl --flags '{\"\\"\"WEBGL_VERSION\"\\"\": 1, \"\\"\"WEBGL_CPU_FORWARD\"\\"\": false, \"\\"\"WEBGL_SIZE_UPLOAD_UNIFORM\"\\"\": 0}'"
4141
"yarn run-browserstack --browsers=bs_safari_mac --tags '$TAGS' --testEnv webgl --flags '{\"\\"\"WEBGL_VERSION\"\\"\": 1, \"\\"\"WEBGL_CPU_FORWARD\"\\"\": false, \"\\"\"WEBGL_SIZE_UPLOAD_UNIFORM\"\\"\": 0}'"
42-
"yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'"
42+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
43+
# "yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'"
4344
"yarn run-browserstack --browsers=bs_android_10 --tags '$TAGS'"
4445
# Test script tag bundles
4546
"karma start ./script_tag_tests/tfjs-core-cpu/karma.conf.js --browserstack --browsers=bs_chrome_mac"

tfjs-automl/karma.conf.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ module.exports = function(config) {
7171
preprocessors: {'**/*.ts': ['karma-typescript']},
7272
karmaTypescriptConfig,
7373
reporters: ['progress', 'karma-typescript'],
74-
port: 9866,
74+
port: 9200,
7575
colors: true,
7676
browsers: ['Chrome'],
7777
client: {jasmine: {random: false}, args: args},
@@ -82,7 +82,7 @@ module.exports = function(config) {
8282
tunnelIdentifier:
8383
`tfjs_automl_${Date.now()}_${Math.floor(Math.random() * 1000)}`
8484
},
85-
captureTimeout: 3e5,
85+
captureTimeout: 10 * 1000,
8686
reportSlowerThan: 500,
8787
browserNoActivityTimeout: 3e5,
8888
browserDisconnectTimeout: 3e5,
@@ -94,21 +94,21 @@ module.exports = function(config) {
9494
browser: 'chrome',
9595
browser_version: 'latest',
9696
os: 'OS X',
97-
os_version: 'High Sierra'
97+
os_version: 'Ventura'
9898
},
9999
bs_firefox_mac: {
100100
base: 'BrowserStack',
101101
browser: 'firefox',
102102
browser_version: 'latest',
103103
os: 'OS X',
104-
os_version: 'High Sierra'
104+
os_version: 'Ventura'
105105
},
106106
bs_safari_mac: {
107107
base: 'BrowserStack',
108108
browser: 'safari',
109109
browser_version: 'latest',
110110
os: 'OS X',
111-
os_version: 'Big Sur'
111+
os_version: 'Ventura'
112112
},
113113
bs_ios_12: {
114114
base: 'BrowserStack',

tfjs-automl/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"test-node": "tsc && ts-node --transpile-only --skip-ignore --project tsconfig.test.json src/test_node.ts",
1616
"coverage": "KARMA_COVERAGE=1 karma start --singleRun",
1717
"run-flaky": "node ../scripts/run_flaky.js",
18-
"run-browserstack": "karma start --singleRun --reporters='dots,karma-typescript,BrowserStack' --hostname='bs-local.com'",
18+
"run-browserstack": "karma start --singleRun --reporters='dots,karma-typescript,BrowserStack'",
1919
"test-ci": "./scripts/test-ci.sh",
2020
"build-npm": "./scripts/build-npm.sh"
2121
},

tfjs-automl/scripts/test-ci.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@ yarn run-flaky "yarn run-browserstack --browsers=bs_chrome_mac"
2727
# Run the rest of the karma tests in parallel. These runs will reuse the
2828
# already downloaded binary.
2929
npm-run-all -p -c --aggregate-output \
30-
"run-flaky \"yarn run-browserstack --browsers=bs_firefox_mac\"" \
31-
"run-flaky \"yarn run-browserstack --browsers=bs_safari_mac --testEnv webgl1\""
30+
"run-flaky \"yarn run-browserstack --browsers=bs_safari_mac --testEnv webgl1\""
31+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
32+
# "run-flaky \"yarn run-browserstack --browsers=bs_firefox_mac\"" \
33+

tfjs-backend-wasm/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ tfjs_web_test(
151151
],
152152
browsers = [
153153
"bs_chrome_mac",
154-
"bs_firefox_mac",
154+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
155+
# "bs_firefox_mac",
155156
"bs_safari_mac",
156157
"bs_ios_12",
157158
# TODO(mattsoulanille): Fix clipByValue on Android.

tfjs-backend-webgl/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ tfjs_web_test(
107107
],
108108
browsers = [
109109
"bs_chrome_mac",
110-
"bs_firefox_mac",
110+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
111+
# "bs_firefox_mac",
111112
"bs_android_10",
112113
"win_10_chrome",
113114
],

tfjs-backend-webgl/scripts/build-npm.sh

-30
This file was deleted.

tfjs-backend-webgl/scripts/test-ci.sh

-28
This file was deleted.

tfjs-backend-webgl/scripts/tsconfig.json

-6
This file was deleted.

tfjs-backend-webgpu/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = function(config) {
6767
require('karma-jasmine-html-reporter'),
6868
],
6969
exclude,
70-
port: 9876,
70+
port: 9200,
7171
colors: true,
7272
autoWatch: false,
7373
browsers: ['Chrome', 'chrome_webgpu'],

tfjs-core/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ tfjs_web_test(
111111
],
112112
browsers = [
113113
"bs_chrome_mac",
114-
"bs_firefox_mac",
114+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
115+
# "bs_firefox_mac",
115116
"bs_safari_mac",
116117
"bs_ios_12",
117118
"bs_android_10",

tfjs-core/src/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ tfjs_web_test(
222222
name = "worker_test",
223223
browsers = [
224224
"bs_chrome_mac",
225-
"bs_firefox_mac",
225+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
226+
# "bs_firefox_mac",
226227
"bs_safari_mac",
227228
# Temporarily disabled because BrowserStack does not support loading
228229
# absolute paths in iOS, which is required for loading the worker.

tfjs-data/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = function(config) {
2727
{tsconfig: 'tsconfig.json', compilerOptions: {module: 'commonjs'}},
2828
reporters: ['progress', 'karma-typescript'],
2929
browsers: ['Chrome'],
30-
port: 9876,
30+
port: 9200,
3131
browserStack: {
3232
username: process.env.BROWSERSTACK_USERNAME,
3333
accessKey: process.env.BROWSERSTACK_KEY,

tfjs-layers/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ tfjs_web_test(
5151
],
5252
browsers = [
5353
"bs_chrome_mac",
54-
"bs_firefox_mac",
54+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
55+
# "bs_firefox_mac",
5556
# disabled android test due to training flakiness
5657
# "bs_android_10",
5758
"win_10_chrome",

tfjs-layers/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = function(config) {
5656
karmaTypescriptConfig,
5757
reporters: ['progress', 'karma-typescript'],
5858
browsers: ['Chrome'],
59-
port: 9846,
59+
port: 9200,
6060
browserStack: {
6161
username: process.env.BROWSERSTACK_USERNAME,
6262
accessKey: process.env.BROWSERSTACK_KEY,

tfjs-tfdf/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ tfjs_web_test(
107107
browsers = [
108108
# TODO: Support Safari.
109109
"bs_chrome_mac",
110-
"bs_firefox_mac",
110+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
111+
# "bs_firefox_mac",
111112
"bs_android_10",
112113
"win_10_chrome",
113114
],

tfjs-tflite/src/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ tfjs_web_test(
104104
name = "worker_test",
105105
browsers = [
106106
"bs_chrome_mac",
107-
"bs_firefox_mac",
107+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
108+
# "bs_firefox_mac",
108109
"bs_safari_mac",
109110
# Temporarily disabled because BrowserStack does not support loading
110111
# absolute paths in iOS, which is required for loading the worker.

tfjs-vis/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module.exports = function(config) {
6868
karmaTypescriptConfig,
6969
reporters: ['progress', 'karma-typescript'],
7070
browsers: ['Chrome'],
71-
port: 9836,
71+
port: 9200,
7272
browserStack: {
7373
username: process.env.BROWSERSTACK_USERNAME,
7474
accessKey: process.env.BROWSERSTACK_KEY,

tfjs-vis/scripts/test-ci.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ yarn run-flaky "yarn run-browserstack --browsers=bs_chrome_mac"
2626

2727
# Run the rest of the karma tests in parallel. These runs will reuse the
2828
# already downloaded binary.
29-
npm-run-all -p -c --aggregate-output \
30-
"run-flaky \"yarn run-browserstack --browsers=bs_firefox_mac\"" \
31-
"run-flaky \"yarn run-browserstack --browsers=bs_safari_mac\""
29+
yarn run-flaky "yarn run-browserstack --browsers=bs_safari_mac"
30+
#npm-run-all -p -c --aggregate-output \
31+
#"run-flaky \"yarn run-browserstack --browsers=bs_safari_mac\""
32+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
33+
# "run-flaky \"yarn run-browserstack --browsers=bs_firefox_mac\"" \
34+

tfjs/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = function(config) {
5454
karmaTypescriptConfig,
5555
reporters: ['progress', 'karma-typescript'],
5656
browsers: ['Chrome'],
57-
port: 9806,
57+
port: 9200,
5858
browserStack: {
5959
username: process.env.BROWSERSTACK_USERNAME,
6060
accessKey: process.env.BROWSERSTACK_KEY,

tfjs/scripts/test-ci.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
# Exit immediately if a command exits with a non-zero status.
1818
set -e
1919

20-
node ../scripts/run_flaky.js "yarn karma start --browsers='bs_firefox_mac' --singleRun"
20+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
21+
# node ../scripts/run_flaky.js "yarn karma start --browsers='bs_firefox_mac' --singleRun"
2122
node ../scripts/run_flaky.js "yarn karma start --browsers='bs_chrome_mac' --singleRun"
2223
yarn test-tools
2324

tools/karma_template.conf.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
*/
1717

1818
const browserstackConfig = {
19-
port: 9876,
19+
// Browserstack only supports a certain range of ports for safari.
20+
// Karma will automatically use the next available port if the
21+
// chosen one is in use. Starting at 9200 gives us the largest
22+
// range of ports (9200 - 9400).
23+
// https://www.browserstack.com/question/39572
24+
port: 9200,
2025
};
2126

2227
// Select Chrome or ChromeHeadless based on the value of the --//:headless flag.

tools/tfjs_web_test.bzl

+2-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ def tfjs_web_test(name, ci = True, args = [], **kwargs):
122122

123123
browsers = kwargs.pop("browsers", [
124124
"bs_chrome_mac",
125-
"bs_firefox_mac",
125+
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
126+
# "bs_firefox_mac",
126127
"bs_safari_mac",
127128
"bs_ios_12",
128129
"bs_android_10",

0 commit comments

Comments
 (0)