Skip to content

Commit 3a63b18

Browse files
authored
Merge pull request #3599 from plotly/flaky-less
Adding third container for jasmine tests to avoid flaky fails
2 parents bcf05db + b05d15c commit 3a63b18

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

.circleci/config.yml

+16
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,19 @@ jobs:
7070
name: Run jasmine tests (batch 2)
7171
command: ./.circleci/test.sh jasmine2
7272

73+
test-jasmine3:
74+
docker:
75+
# need '-browsers' version to test in real (xvfb-wrapped) browsers
76+
- image: circleci/node:10.9.0-browsers
77+
working_directory: ~/plotly.js
78+
steps:
79+
- checkout
80+
- attach_workspace:
81+
at: ~/plotly.js
82+
- run:
83+
name: Run jasmine tests (batch 3)
84+
command: ./.circleci/test.sh jasmine3
85+
7386
test-image:
7487
docker:
7588
- image: plotly/testbed:latest
@@ -165,6 +178,9 @@ workflows:
165178
- test-jasmine2:
166179
requires:
167180
- build
181+
- test-jasmine3:
182+
requires:
183+
- build
168184
- test-image:
169185
requires:
170186
- build

.circleci/test.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ case $1 in
4545
set_tz
4646

4747
npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48-
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
4948
npm run test-bundle || EXIT_STATE=$?
5049

5150
exit $EXIT_STATE
@@ -63,6 +62,18 @@ case $1 in
6362
exit $EXIT_STATE
6463
;;
6564

65+
jasmine3)
66+
set_tz
67+
68+
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky))
69+
70+
for s in ${SHARDS[@]}; do
71+
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
72+
done
73+
74+
exit $EXIT_STATE
75+
;;
76+
6677
image)
6778
npm run test-image || EXIT_STATE=$?
6879
exit $EXIT_STATE

test/jasmine/tests/select_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ describe('Click-to-select', function() {
175175
} else {
176176
setTimeout(function() {
177177
click(x, y, clickOpts);
178-
}, DBLCLICKDELAY * 1.01);
178+
}, DBLCLICKDELAY * 1.03);
179179
}
180180

181181
return selectedPromise;

0 commit comments

Comments
 (0)