test with logs

twilio · Sep 30, 2024 · 517e27a · 517e27a
1 parent 03baa5f
commit 517e27a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/skip_pr_workflow.yaml b/.github/workflows/skip_pr_workflow.yaml
@@ -1,23 +1,23 @@
-name: Skip Test
+# name: Skip Test
 
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'lerna.json'
-  push:
-    branches:
-      - main
-    paths:
-      - 'lerna.json'
+# on:
+#   pull_request:
+#     branches:
+#       - main
+#     paths:
+#       - 'lerna.json'
+#   push:
+#     branches:
+#       - main
+#     paths:
+#       - 'lerna.json'
 
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "Test execution not required. Passing status check"
-  release-alpha-version:
-    uses: ./.github/workflows/skip_publish.yaml
-  e2e-test:
-    uses: ./.github/workflows/skip_e2e.yaml
+# jobs:
+#   build-and-test:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - run: echo "Test execution not required. Passing status check"
+#   release-alpha-version:
+#     uses: ./.github/workflows/skip_publish.yaml
+#   e2e-test:
+#     uses: ./.github/workflows/skip_e2e.yaml
diff --git a/.github/workflows/~reusable_e2e_by_OS.yaml b/.github/workflows/~reusable_e2e_by_OS.yaml
@@ -160,7 +160,7 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: Ubuntu-screenshots
+          name: ${{ inputs.OS }}-screenshots
           path: packages/flex-plugin-e2e-tests/screenshots
 
   notify-failure:

diff --git a/packages/flex-plugin-e2e-tests/src/tests/step006.ts b/packages/flex-plugin-e2e-tests/src/tests/step006.ts
@@ -40,7 +40,6 @@ const testSuite: TestSuite = async ({ scenario, config, secrets, environment }:
 
   const onError = async (e: any) => {
     await Browser.app.takeScreenshot(environment.cwd);
-    throw e;
   };
 
   const onFinally = async () => {

diff --git a/packages/flex-plugin-e2e-tests/src/tests/step010.ts b/packages/flex-plugin-e2e-tests/src/tests/step010.ts
@@ -54,7 +54,6 @@ const testSuite: TestSuite = async ({ scenario, config, secrets, environment }:
 
   const onError = async (e: any) => {
     await Browser.app.takeScreenshot(environment.cwd);
-    throw e;
   };
 
   const onFinally = async () => {

diff --git a/packages/flex-plugin-e2e-tests/src/tests/step011.ts b/packages/flex-plugin-e2e-tests/src/tests/step011.ts
@@ -44,7 +44,6 @@ const testSuite: TestSuite = async ({ scenario, config, secrets, environment }:
 
   const onError = async (e: any) => {
     await Browser.app.takeScreenshot(environment.cwd);
-    throw e;
   };
 
   const onFinally = async () => {

diff --git a/packages/flex-plugin-e2e-tests/src/tests/step012.ts b/packages/flex-plugin-e2e-tests/src/tests/step012.ts
@@ -67,7 +67,6 @@ const testSuite: TestSuite = async ({ scenario, config, secrets, environment }:
 
   const onError = async (e: any) => {
     await Browser.app.takeScreenshot(environment.cwd);
-    throw e;
   };
 
   const onFinally = async () => {

diff --git a/packages/flex-plugin-e2e-tests/src/tests/step013.ts b/packages/flex-plugin-e2e-tests/src/tests/step013.ts
@@ -71,7 +71,6 @@ const testSuite: TestSuite = async ({ scenario, config, secrets, environment }:
 
   const onError = async (e: any) => {
     await Browser.app.takeScreenshot(environment.cwd);
-    throw e;
   };
 
   const onFinally = async () => {

diff --git a/packages/flex-plugin-e2e-tests/src/utils/pages/view/twilio-console.ts b/packages/flex-plugin-e2e-tests/src/utils/pages/view/twilio-console.ts
@@ -73,6 +73,7 @@ export class TwilioConsole extends Base {
         );
 
         // Log in Flex via service login
+        logger.info('Logging in Flex via service login on first load');
         await this.goto({ baseUrl: this._baseUrl, path });
       } else {
         throw new Error('Unable to fetch CSRF token to login to Twilio Console');

diff --git a/packages/flex-plugin-e2e-tests/src/utils/spawn.ts b/packages/flex-plugin-e2e-tests/src/utils/spawn.ts
@@ -160,8 +160,8 @@ export const retryOnError = async (
     } catch (error) {
       logger.info('Shwet', error);
       if (attempts === maxRetries) {
-        await onFinally(); // cleanup
         await onError(error); // Handle error if all retries fail
+        await onFinally(); // cleanup
         throw new Error(`Operation failed after ${maxRetries} retries`);
       } else {
         logger.info(`Attempt ${attempts} failed. Retrying...`);