setTutorialFailed declaration

ITISFoundation · Nov 18, 2024 · 05b1c78 · 05b1c78
1 parent 9baf7b8
commit 05b1c78
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 35 deletions.
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
   }
 }