setTutorialFailed declaration

odeimaiz · odeimaiz · commit 05b1c78aa1da · 2024-11-18T17:08:34.000+01:00
diff --git a/tests/e2e/portal-files/VTK_file.js b/tests/e2e/portal-files/VTK_file.js
@@ -60,7 +60,7 @@ async function runTutorial () {
     await utils.takeScreenshot(page, screenshotPrefix + 'teapot');
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/2D_Plot.js b/tests/e2e/portal/2D_Plot.js
@@ -51,7 +51,7 @@ async function runTutorial () {
     await utils.takeScreenshot(page, screenshotPrefix + 'iFrame2');
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/3D_Anatomical.js b/tests/e2e/portal/3D_Anatomical.js
@@ -39,7 +39,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(1, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/3D_EM.js b/tests/e2e/portal/3D_EM.js
@@ -39,7 +39,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(2, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/BIOS_VNS_Calibrator.js b/tests/e2e/portal/BIOS_VNS_Calibrator.js
@@ -40,7 +40,7 @@ async function runTutorial () {
     await tutorial.restoreIFrame();
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/Bornstein.js b/tests/e2e/portal/Bornstein.js
@@ -40,7 +40,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(0, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/CC_Human.js b/tests/e2e/portal/CC_Human.js
@@ -53,7 +53,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(3, outFiles2);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/CC_Rabbit.js b/tests/e2e/portal/CC_Rabbit.js
@@ -54,7 +54,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(3, outFiles2);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/Kember.js b/tests/e2e/portal/Kember.js
@@ -63,7 +63,7 @@ async function runTutorial () {
     await tutorial.takeScreenshot("viewer_after");
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/Mattward.js b/tests/e2e/portal/Mattward.js
@@ -45,7 +45,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(0, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/portal/opencor.js b/tests/e2e/portal/opencor.js
@@ -39,7 +39,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(0, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/publications/SarValidation.js b/tests/e2e/publications/SarValidation.js
@@ -40,7 +40,7 @@ async function runTutorial () {
     await tutorial.testSARValidation(sarNodeId);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true, false);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/publications/Voila.js b/tests/e2e/publications/Voila.js
@@ -43,7 +43,7 @@ async function runTutorial () {
     await tutorial.waitForVoilaRendered(iframe);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true, false);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/s4l/sim4life-dipole.js b/tests/e2e/s4l/sim4life-dipole.js
@@ -49,7 +49,7 @@ async function runTutorial() {
     await tutorial.testS4LDipole(s4lNodeId);
   }
   catch (err) {
-    tutorial.setTutorialFailed(true, false);
+    tutorial.setTutorialFailed(err);
     console.log('Tutorial error: ' + err);
     throw "Tutorial Failed";
   }
diff --git a/tests/e2e/s4l/sim4life-lite.js b/tests/e2e/s4l/sim4life-lite.js
@@ -65,7 +65,7 @@ async function runTutorial(user, pass, newUser, parallelUserIdx) {
     await tutorial.testS4L(s4lNodeId);
   }
   catch (err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
     throw "Tutorial Failed";
   }
diff --git a/tests/e2e/s4l/sim4life.js b/tests/e2e/s4l/sim4life.js
@@ -40,7 +40,7 @@ async function runTutorial() {
     await tutorial.testS4L(s4lNodeId);
   }
   catch (err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/isolve-gpu.js b/tests/e2e/tutorials/isolve-gpu.js
@@ -42,7 +42,7 @@ async function runTutorial() {
     await tutorial.checkNodeLogsFunctional();
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/isolve-mpi.js b/tests/e2e/tutorials/isolve-mpi.js
@@ -40,7 +40,7 @@ async function runTutorial() {
     await tutorial.checkNodeLogsFunctional();
   }
   catch (err) {
-    await tutorial.setTutorialFailed(true, err);
+    await tutorial.setTutorialFailed(err);
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/jupyterlabs.js b/tests/e2e/tutorials/jupyterlabs.js
@@ -78,7 +78,7 @@ async function runTutorial() {
     }
   }
   catch (err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/rclone_large.js b/tests/e2e/tutorials/rclone_large.js
@@ -64,12 +64,12 @@ async function runTutorial() {
 
       await tutorial.takeScreenshot("after_run_all_menu");
 
-     
+
       await tutorial.waitFor(60000); // we are creating 12 x 1 GB files with 75 % probability
     }
   }
   catch (err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/rclone_small.js b/tests/e2e/tutorials/rclone_small.js
@@ -68,7 +68,7 @@ async function runTutorial() {
     }
   }
   catch (err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/sleepers.js b/tests/e2e/tutorials/sleepers.js
@@ -39,7 +39,7 @@ async function runTutorial() {
     await tutorial.checkNodeLogsFunctional();
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {
diff --git a/tests/e2e/tutorials/ti-plan.js b/tests/e2e/tutorials/ti-plan.js
@@ -136,7 +136,7 @@ async function runTutorial() {
       .then(() => page.click(id))
       .catch(() => console.log("Preparing Inputs window not found"));
 
-    tutorial.setTutorialFailed(true, false);
+    tutorial.setTutorialFailed(err);
     console.log('Tutorial error: ' + err);
     throw "Tutorial Failed";
   }
diff --git a/tests/e2e/tutorials/tutorialBase.js b/tests/e2e/tutorials/tutorialBase.js
@@ -414,12 +414,6 @@ class TutorialBase {
     await auto.showLogger(this.__page, show);
   }
 
-  async takeLoggerScreenshot() {
-    await this.takeScreenshot("logger_before");
-    await this.showLogger(true);
-    await this.takeScreenshot("logger_after");
-  }
-
   async runPipeline() {
     await this.takeScreenshot("runStudy_before");
     await auto.runStudy(this.__page);
@@ -835,11 +829,8 @@ class TutorialBase {
     return this.__reasonFailed;
   }
 
-  async setTutorialFailed(failed, loggerScreenshot = true, reason = "") {
-    if (failed && loggerScreenshot) {
-      await this.takeLoggerScreenshot();
-    }
-    this.__failed = failed;
+  async setTutorialFailed(reason = "") {
+    this.__failed = true;
     this.__reasonFailed = reason
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ async function runTutorial () {`
`60`	`60`	`await utils.takeScreenshot(page, screenshotPrefix + 'teapot');`
`61`	`61`	`}`
`62`	`62`	`catch(err) {`
`63`		`- await tutorial.setTutorialFailed(true);`
	`63`	`+ await tutorial.setTutorialFailed();`
`64`	`64`	`console.log('Tutorial error: ' + err);`
`65`	`65`	`}`
`66`	`66`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ async function runTutorial () {`
`51`	`51`	`await utils.takeScreenshot(page, screenshotPrefix + 'iFrame2');`
`52`	`52`	`}`
`53`	`53`	`catch(err) {`
`54`		`- await tutorial.setTutorialFailed(true);`
	`54`	`+ await tutorial.setTutorialFailed();`
`55`	`55`	`console.log('Tutorial error: ' + err);`
`56`	`56`	`}`
`57`	`57`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ async function runTutorial () {`
`39`	`39`	`await tutorial.checkNodeOutputs(1, outFiles);`
`40`	`40`	`}`
`41`	`41`	`catch(err) {`
`42`		`- await tutorial.setTutorialFailed(true);`
	`42`	`+ await tutorial.setTutorialFailed();`
`43`	`43`	`console.log('Tutorial error: ' + err);`
`44`	`44`	`}`
`45`	`45`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ async function runTutorial () {`
`40`	`40`	`await tutorial.restoreIFrame();`
`41`	`41`	`}`
`42`	`42`	`catch(err) {`
`43`		`- await tutorial.setTutorialFailed(true);`
	`43`	`+ await tutorial.setTutorialFailed();`
`44`	`44`	`console.log('Tutorial error: ' + err);`
`45`	`45`	`}`
`46`	`46`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ async function runTutorial () {`
`53`	`53`	`await tutorial.checkNodeOutputs(3, outFiles2);`
`54`	`54`	`}`
`55`	`55`	`catch(err) {`
`56`		`- await tutorial.setTutorialFailed(true);`
	`56`	`+ await tutorial.setTutorialFailed();`
`57`	`57`	`console.log('Tutorial error: ' + err);`
`58`	`58`	`}`
`59`	`59`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ async function runTutorial () {`
`54`	`54`	`await tutorial.checkNodeOutputs(3, outFiles2);`
`55`	`55`	`}`
`56`	`56`	`catch(err) {`
`57`		`- await tutorial.setTutorialFailed(true);`
	`57`	`+ await tutorial.setTutorialFailed();`
`58`	`58`	`console.log('Tutorial error: ' + err);`
`59`	`59`	`}`
`60`	`60`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ async function runTutorial () {`
`63`	`63`	`await tutorial.takeScreenshot("viewer_after");`
`64`	`64`	`}`
`65`	`65`	`catch(err) {`
`66`		`- await tutorial.setTutorialFailed(true);`
	`66`	`+ await tutorial.setTutorialFailed();`
`67`	`67`	`console.log('Tutorial error: ' + err);`
`68`	`68`	`}`
`69`	`69`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ async function runTutorial () {`
`45`	`45`	`await tutorial.checkNodeOutputs(0, outFiles);`
`46`	`46`	`}`
`47`	`47`	`catch(err) {`
`48`		`- await tutorial.setTutorialFailed(true);`
	`48`	`+ await tutorial.setTutorialFailed();`
`49`	`49`	`console.log('Tutorial error: ' + err);`
`50`	`50`	`}`
`51`	`51`	`finally {`