Merge pull request eficode#56 from eficode/fix/linux-tests

Fix linux tests
damies13 · Dec 14, 2021 · 0778575 · 0778575
2 parents 95ab7e2 + 793bfe4
commit 0778575
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Install test tools to Linux
         run: |
           sudo apt-get update
-          sudo apt-get -y -q install xvfb scrot chromium-browser
+          sudo apt-get -y -q install xvfb scrot
           touch ~/.Xauthority
         if: contains(matrix.os, 'ubuntu')
 
@@ -70,15 +70,10 @@ jobs:
           python tests/atest/run_tests.py
 
       - name: Archive acceptances test results
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v2.3.0
         with:
-          name: log-${{ matrix.python-version }}-${{ matrix.os }}
-          path: log.html
+          name: output-${{ matrix.python-version }}-${{ matrix.os }}
+          path: |
+            log.html
+            ./*.png
         if: always() && job.status == 'failure'
-
-      - name: Archive acceptances test failure screenshot on Linux
-        uses: actions/[email protected]
-        with:
-          name: screenshot-${{ matrix.python-version }}-${{ matrix.os }}
-          path: /tmp/Atest.Calculator-screenshot-1.png
-        if: always() && job.status == 'failure' && contains(matrix.os, 'ubuntu')
diff --git a/tests/atest/calculator.robot b/tests/atest/calculator.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Library    ImageHorizonLibrary    ${CURDIR}${/}reference_images${/}calculator    screenshot_folder=${TEMPDIR}
+Library    ImageHorizonLibrary    ${CURDIR}${/}reference_images${/}calculator    screenshot_folder=${OUTPUT_DIR}
 
 *** Test cases ***
 

diff --git a/tests/atest/calculator/calculator.py b/tests/atest/calculator/calculator.py
@@ -13,4 +13,6 @@ def close():
     sys.exit(0)
 
 
-eel.start('main.html', size=(300, 380))
+mode = 'edge' if os.name == 'nt' else 'chrome'
+
+eel.start('main.html', size=(300, 380), mode=mode)
diff --git a/tests/atest/reference_images/calculator/inputs_folder/inputs.png b/tests/atest/reference_images/calculator/inputs_folder/inputs.png
diff --git a/tests/atest/reference_images/calculator/inputs_folder/inputs_local.png b/tests/atest/reference_images/calculator/inputs_folder/inputs_local.png
diff --git a/tests/atest/reference_images/calculator/inputs_folder/inputs_ubuntu.png b/tests/atest/reference_images/calculator/inputs_folder/inputs_ubuntu.png
diff --git a/tests/atest/reference_images/calculator/inputs_folder/inputs_windows.png b/tests/atest/reference_images/calculator/inputs_folder/inputs_windows.png