Skip to content

Adding third container for jasmine tests to avoid flaky fails #3599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 5, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,19 @@ jobs:
name: Run jasmine tests (batch 2)
command: ./.circleci/test.sh jasmine2

test-jasmine3:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:10.9.0-browsers
working_directory: ~/plotly.js
steps:
- checkout
- attach_workspace:
at: ~/plotly.js
- run:
name: Run jasmine tests (batch 3)
command: ./.circleci/test.sh jasmine3

test-image:
docker:
- image: plotly/testbed:latest
Expand Down Expand Up @@ -165,6 +178,9 @@ workflows:
- test-jasmine2:
requires:
- build
- test-jasmine3:
requires:
- build
- test-image:
requires:
- build
Expand Down
13 changes: 12 additions & 1 deletion .circleci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ case $1 in
set_tz

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

exit $EXIT_STATE
Expand All @@ -63,6 +62,18 @@ case $1 in
exit $EXIT_STATE
;;

jasmine3)
set_tz

SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky))

for s in ${SHARDS[@]}; do
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be:

 retry npm run test-jasmine -- "$s"  --tags=flaky --skip-tags=noCI

done

exit $EXIT_STATE
;;

image)
npm run test-image || EXIT_STATE=$?
exit $EXIT_STATE
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/select_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ describe('Click-to-select', function() {
} else {
setTimeout(function() {
click(x, y, clickOpts);
}, DBLCLICKDELAY * 1.01);
}, DBLCLICKDELAY * 2);
}

return selectedPromise;
Expand Down