wip

trezor · May 9, 2022 · 6e069cf · 6e069cf
1 parent 453853a
commit 6e069cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/test_with_trezor-user-env.yml b/.github/workflows/test_with_trezor-user-env.yml
@@ -75,7 +75,7 @@ jobs:
       with:
         name: build-artifact
         path: build
-    - run: sudo apt-get install xvfb
+    # - run: sudo apt-get install xvfb
     - run: "./docker/docker-connect-test.sh web -p ${{ inputs.test-pattern }} -i ${{ inputs.methods }}"
     # xvfb is required to run karma
     # - run: sudo apt-get install xvfb

diff --git a/docker/docker-compose.connect-test.yml b/docker/docker-compose.connect-test.yml
@@ -18,7 +18,7 @@ services:
     depends_on:
       - trezor-user-env-unix
     network_mode: service:trezor-user-env-unix
-    working_dir: /trezor-suite
+    working_dir: /connect
     command: bash -c "docker/wait-for-env.sh && $TESTS_SCRIPT $TESTS_PATTERN"
     volumes:
-      - ../:/trezor-suite
+      - ../:/connect
diff --git a/karma.config.production.js b/karma.config.production.js
@@ -28,7 +28,20 @@ module.exports = config => {
             useIframe: false,
             runInParent: true,
         },
-        browsers: ['Chrome'],
+        browsers: [
+            // 'Chrome',
+            'ChromeHeadlessNoSandbox',
+        ],
+        customLaunchers: {
+            ChromeHeadlessNoSandbox: {
+                base: 'ChromeHeadless',
+                flags: ['--no-sandbox'],
+            },
+            Chrome: {
+                base: 'Chrome',
+                flags: ['--no-sandbox'],
+            },
+        },
         concurrency: 0,
         browserNoActivityTimeout: 6000000,
         colors: true,

diff --git a/tests/common.setup.js b/tests/common.setup.js
@@ -17,19 +17,19 @@ let firmware = process.env.TESTS_FIRMWARE;
 
 if (firmware === '1-latest') {
     // firmware = releases1[0].version.join('.');
-    firmware = releases1[releases1.length - 2].version.join('.');
+    firmware = releases1[1].version.join('.');
 }
 
 if (firmware === '2-latest') {
     // firmware = releases2[0].version.join('.');
-    firmware = releases2[releases2.length - 2].version.join('.');
+    firmware = releases2[1].version.join('.');
 }
 
 if (!firmware) {
     // fallback to the latest officially release model T firmware
     // firmware = releases2[0].version.join('.');
 
-    firmware = releases2[releases2.length - 2].version.join('.');
+    firmware = releases2[1].version.join('.');
 }
 
 const wait = ms =>