Skip to content

Commit 522bfc6

Browse files
πŸ› [p2e] Update vtk tests (#7911)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 4d8911d commit 522bfc6

File tree

8 files changed

+36
-7
lines changed

8 files changed

+36
-7
lines changed

β€Žtests/e2e/portal-files/VTK_file.jsβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ async function runTutorial () {
3838

3939
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
4040
const nodeIdViewer = workbenchData["nodeIds"][1];
41-
await tutorial.waitForServices(workbenchData["studyId"], [nodeIdViewer], startTimeout);
41+
await tutorial.waitForServices(
42+
workbenchData["studyId"],
43+
[nodeIdViewer],
44+
startTimeout,
45+
false
46+
);
4247
await utils.takeScreenshot(page, screenshotPrefix + 'service_started');
4348

4449
// Some time for setting up service's frontend

β€Žtests/e2e/portal/2D_Plot.jsβ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ async function runTutorial () {
2626

2727
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
2828
const nodeIdViewer = workbenchData["nodeIds"][1];
29-
await tutorial.waitForServices(workbenchData["studyId"], [nodeIdViewer], startTimeout);
29+
await tutorial.waitForServices(
30+
workbenchData["studyId"],
31+
[nodeIdViewer],
32+
startTimeout
33+
);
3034

3135
await tutorial.waitFor(5000, 'Some time for starting the service');
3236
await utils.takeScreenshot(page, screenshotPrefix + 'service_started');

β€Žtests/e2e/portal/3D_Anatomical.jsβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ async function runTutorial () {
2525
const studyData = await tutorial.openStudyLink();
2626

2727
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
28-
await tutorial.waitForServices(workbenchData["studyId"], [workbenchData["nodeIds"][1]], startTimeout);
28+
await tutorial.waitForServices(
29+
workbenchData["studyId"],
30+
[workbenchData["nodeIds"][1]],
31+
startTimeout,
32+
false
33+
);
2934

3035
await tutorial.waitFor(10000, 'Some time for starting the service');
3136
await utils.takeScreenshot(page, screenshotPrefix + 'service_started');

β€Žtests/e2e/portal/3D_EM.jsβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ async function runTutorial () {
2525
const studyData = await tutorial.openStudyLink();
2626

2727
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
28-
await tutorial.waitForServices(workbenchData["studyId"], [workbenchData["nodeIds"][2]], startTimeout);
28+
await tutorial.waitForServices(
29+
workbenchData["studyId"],
30+
[workbenchData["nodeIds"][2]],
31+
startTimeout,
32+
false
33+
);
2934

3035
await tutorial.waitFor(10000, 'Some time for starting the service');
3136
await utils.takeScreenshot(page, screenshotPrefix + 'service_started');

β€Žtests/e2e/portal/BIOS_VNS_Calibrator.jsβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ async function runTutorial () {
2727
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
2828
console.log("Workbench Data:", workbenchData);
2929
const BIOSIdViewer = workbenchData["nodeIds"][0];
30-
await tutorial.waitForServices(workbenchData["studyId"],
30+
await tutorial.waitForServices(
31+
workbenchData["studyId"],
3132
[BIOSIdViewer],
3233
startTimeout,
3334
false

β€Žtests/e2e/portal/Bornstein.jsβ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ async function runTutorial () {
2525
const studyData = await tutorial.openStudyLink();
2626

2727
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
28-
await tutorial.waitForServices(workbenchData["studyId"], [workbenchData["nodeIds"][0]], startTimeout);
28+
await tutorial.waitForServices(
29+
workbenchData["studyId"],
30+
[workbenchData["nodeIds"][0]],
31+
startTimeout
32+
);
2933

3034
await tutorial.waitFor(60000, 'Some time for starting the service');
3135
await utils.takeScreenshot(page, screenshotPrefix + 'service_started');

β€Žtests/e2e/portal/Mattward.jsβ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ async function runTutorial () {
2525
const studyData = await tutorial.openStudyLink();
2626

2727
const workbenchData = utils.extractWorkbenchData(studyData["data"]);
28-
await tutorial.waitForServices(workbenchData["studyId"], [workbenchData["nodeIds"][0]], startTimeout);
28+
await tutorial.waitForServices(
29+
workbenchData["studyId"],
30+
[workbenchData["nodeIds"][0]],
31+
startTimeout
32+
);
2933

3034
await tutorial.waitFor(20000, 'Some time for starting the service');
3135
await utils.takeScreenshot(page, screenshotPrefix + 'service_started');

β€Žtests/e2e/tutorials/tutorialBase.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ class TutorialBase {
337337
return appModeButtonIds;
338338
}
339339

340+
// the waitForConnected only works for old dynamic services
340341
async waitForServices(studyId, nodeIds, timeout = 40000, waitForConnected = true) {
341342
console.log("waitForServices timeout:", timeout);
342343
if (nodeIds.length < 1) {

0 commit comments

Comments
Β (0)