Skip to content

Adjust some noCI gl tests and run them on CircleCI #5646

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.

Sign up for GitHub

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 2 commits into from
May 8, 2021
Merged

Adjust some noCI gl tests and run them on CircleCI #5646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
650e100
adjust positions using node-12.22.1 and Chrome-90 and run on CI
archmoj May 8, 2021
7502d90
retry parallel jasmine tests once to pass module load errors
archmoj May 8, 2021
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
5 changes: 3 additions & 2 deletions .circleci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ case $1 in
set_tz

SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
MAX_AUTO_RETRY=2
retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?

exit $EXIT_STATE
;;
Expand All @@ -55,7 +56,7 @@ case $1 in

SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
for s in ${SHARDS[@]}; do
MAX_AUTO_RETRY=1
MAX_AUTO_RETRY=2
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
done

Expand Down
39 changes: 17 additions & 22 deletions test/jasmine/tests/gl3d_hover_click_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ describe('Test gl3d trace click/hover:', function() {
.then(done, done.fail);
});

it('@noCI @gl should display correct face colors', function(done) {
it('@gl should display correct face colors', function(done) {
var fig = mesh3dcoloringMock;

Plotly.newPlot(gd, fig)
Expand Down Expand Up @@ -595,7 +595,7 @@ describe('Test gl3d trace click/hover:', function() {
.then(done, done.fail);
});

it('@noCI @gl should display correct face intensities (uniform grid)', function(done) {
it('@gl should display correct face intensities (uniform grid)', function(done) {
var fig = mesh3dcellIntensityMock;

Plotly.newPlot(gd, fig)
Expand Down Expand Up @@ -625,37 +625,32 @@ describe('Test gl3d trace click/hover:', function() {
.then(done, done.fail);
});

it('@noCI @gl should display correct face intensities (non-uniform grid)', function(done) {
var fig = mesh3dbunnyMock;
it('@gl should display correct face intensities (non-uniform grid)', function(done) {
var fig = Lib.extendDeep({}, mesh3dbunnyMock);

fig.layout.scene.camera.eye = {
x: 0,
y: 0.2,
z: 0.05
};

Plotly.newPlot(gd, fig)
.then(delay(20))
.then(function() { mouseEvent('mouseover', 300, 200); })
.then(delay(20))
.then(function() {
assertHoverText(
'x: −0.02154988',
'y: −0.1181136',
'z: 0.9471037',
'cell intensity: 8',
'trace 0'
);
})
.then(function() { mouseEvent('mouseover', 400, 300); })
.then(function() { mouseEvent('mouseover', 300, 100); })
.then(delay(20))
.then(function() {
assertHoverText(
'x: −0.3543044',
'y: 0.4389607',
'z: 0.6468034',
'cell intensity: 8',
'x: 0.0112223',
'y: −0.05352963',
'z: 0.5941605',
'cell intensity: 12',
'trace 0'
);
})
.then(done, done.fail);
});

it('@noCI @gl should display correct face intensities *alpha-hull* case', function(done) {
it('@gl should display correct face intensities *alpha-hull* case', function(done) {
var fig = {
data: [{
type: 'mesh3d',
Expand Down Expand Up @@ -698,7 +693,7 @@ describe('Test gl3d trace click/hover:', function() {
.then(done, done.fail);
});

it('@noCI @gl should display correct face intensities *delaunay* case', function(done) {
it('@gl should display correct face intensities *delaunay* case', function(done) {
var fig = {
data: [{
type: 'mesh3d',
Expand Down
8 changes: 4 additions & 4 deletions test/jasmine/tests/select_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,7 @@ describe('Test select box and lasso per trace:', function() {
});

[false, true].forEach(function(hasCssTransform) {
it('@noCI @gl should work on choroplethmapbox traces, hasCssTransform: ' + hasCssTransform, function(done) {
it('@gl should work on choroplethmapbox traces, hasCssTransform: ' + hasCssTransform, function(done) {
var assertPoints = makeAssertPoints(['location', 'z']);
var assertRanges = makeAssertRanges('mapbox');
var assertLassoPoints = makeAssertLassoPoints('mapbox');
Expand All @@ -2034,7 +2034,7 @@ describe('Test select box and lasso per trace:', function() {
[[150, 150], [300, 300]],
function() {
assertPoints([['NY', 10]]);
assertRanges([[-83.29, 46.13], [-73.97, 39.29]]);
assertRanges([[-83.38, 46.13], [-74.06, 39.29]]);
assertSelectedPoints({0: [0]});
},
null, BOXEVENTS, 'choroplethmapbox select'
Expand All @@ -2050,8 +2050,8 @@ describe('Test select box and lasso per trace:', function() {
assertPoints([['MA', 20]]);
assertSelectedPoints({0: [1]});
assertLassoPoints([
[-73.97, 43.936], [-73.97, 39.293], [-67.756, 39.293],
[-67.756, 43.936], [-73.971, 43.936]
[-74.06, 43.936], [-74.06, 39.293], [-67.84, 39.293],
[-67.84, 43.936], [-74.06, 43.936]
]);
},
null, LASSOEVENTS, 'choroplethmapbox lasso'
Expand Down