Skip to content

Commit 0bd03f7

Browse files
mattsoulanillepyu10055
mattsoulanille
and
pyu10055
authored
Re-enable nightly firefox tests (#7954)
* Re-enable nightly firefox tests * Use ios 15 webgl2 for layers tests --------- Co-authored-by: Ping Yu <[email protected]>
1 parent 8879e72 commit 0bd03f7

File tree

13 files changed

+26
-34
lines changed

13 files changed

+26
-34
lines changed

‎e2e/scripts/run-browserstack-tests.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ 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-
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
43-
# "yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'"
42+
"yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'"
4443
"yarn run-browserstack --browsers=bs_android_10 --tags '$TAGS'"
4544
# Test script tag bundles
4645
"karma start ./script_tag_tests/tfjs-core-cpu/karma.conf.js --browserstack --browsers=bs_chrome_mac"

‎tfjs-automl/scripts/test-ci.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,5 @@ 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\"" \
3031
"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

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

‎tfjs-backend-webgl/BUILD.bazel

+3-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,9 @@ tfjs_web_test(
106106
"webgl2",
107107
],
108108
browsers = [
109-
"bs_chrome_mac",
110-
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
111-
# "bs_firefox_mac",
112109
"bs_android_10",
110+
"bs_chrome_mac",
111+
"bs_firefox_mac",
113112
"win_10_chrome",
114113
],
115114
headless = False,
@@ -130,8 +129,8 @@ tfjs_web_test(
130129
"webgl1",
131130
],
132131
browsers = [
133-
"bs_safari_mac",
134132
"bs_ios_12",
133+
"bs_safari_mac",
135134
],
136135
headless = False,
137136
presubmit_browsers = [

‎tfjs-core/BUILD.bazel

+3-4
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,11 @@ tfjs_web_test(
110110
"//tfjs-core/src:tfjs-core_test_bundle",
111111
],
112112
browsers = [
113+
"bs_android_10",
113114
"bs_chrome_mac",
114-
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
115-
# "bs_firefox_mac",
116-
"bs_safari_mac",
115+
"bs_firefox_mac",
117116
"bs_ios_12",
118-
"bs_android_10",
117+
"bs_safari_mac",
119118
"win_10_chrome",
120119
],
121120
static_files = [

‎tfjs-core/src/BUILD.bazel

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

‎tfjs-layers/BUILD.bazel

+2-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ tfjs_web_test(
5151
],
5252
browsers = [
5353
"bs_chrome_mac",
54-
# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
55-
# "bs_firefox_mac",
54+
"bs_firefox_mac",
5655
# disabled android test due to training flakiness
5756
# "bs_android_10",
5857
"win_10_chrome",
58+
"bs_ios_15",
5959
],
6060
headless = False,
6161
seed = "12345",
@@ -76,7 +76,6 @@ tfjs_web_test(
7676
],
7777
browsers = [
7878
"bs_safari_mac",
79-
"bs_ios_12",
8079
],
8180
headless = False,
8281
seed = "12345",

‎tfjs-tfdf/BUILD.bazel

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

‎tfjs-tflite/src/BUILD.bazel

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

‎tfjs-vis/scripts/test-ci.sh

+3-6
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ 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-
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-
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\""

‎tfjs/scripts/test-ci.sh

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

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"
20+
node ../scripts/run_flaky.js "yarn karma start --browsers='bs_firefox_mac' --singleRun"
2221
node ../scripts/run_flaky.js "yarn karma start --browsers='bs_chrome_mac' --singleRun"
2322
yarn test-tools
2423

‎tools/karma_template.conf.js

+7
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ const CUSTOM_LAUNCHERS = {
6262
os_version: '12.3',
6363
real_mobile: true
6464
},
65+
bs_ios_15: {
66+
base: 'BrowserStack',
67+
device: 'iPhone 11 Pro',
68+
os: 'ios',
69+
os_version: '15',
70+
real_mobile: true
71+
},
6572
bs_android_10: {
6673
base: 'BrowserStack',
6774
device: 'Google Pixel 4 XL',

‎tools/tfjs_web_test.bzl

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

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

0 commit comments

Comments
 (0)