Fix tests for ARM and x86 overwriting each others files.

emilsvennesson · Apr 29, 2024 · 0a65e82 · 0a65e82
1 parent 86118d3
commit 0a65e82
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,8 +43,22 @@ jobs:
       continue-on-error: true
     - name: Start proxy server
       run: python -m proxy --threaded --hostname 127.0.0.1 --log-level DEBUG &
-    - name: Run unit tests
-      run: coverage run -m unittest discover
+    - name: Run unit tests for API
+      run: coverage run -m unittest tests/test_api.py
+    - name: Run unit tests for Android ARM
+      run: coverage run -m unittest tests/test_ishelper_android_arm.py
+    - name: Run unit tests for Linux ARM
+      run: coverage run -m unittest tests/test_ishelper_linux_arm.py
+    - name: Run unit tests for Linux x64
+      run: coverage run -m unittest tests/test_ishelper_linux_x64.py
+    - name: Run unit tests for MacOS x64
+      run: coverage run -m unittest tests/test_ishelper_macos_x64.py
+    - name: Run unit tests for Windows x64
+      run: coverage run -m unittest tests/test_ishelper_windows_x64.py
+    - name: Run unit tests for proxy
+      run: coverage run -m unittest tests/test_proxy.py
+    - name: Run unit tests for utils
+      run: coverage run -m unittest tests/test_utils.py
     - name: Run addon using cli
       run: coverage run -a default.py
     - name: Upload code coverage to CodeCov

diff --git a/lib/inputstreamhelper/__init__.py b/lib/inputstreamhelper/__init__.py
@@ -366,6 +366,11 @@ def _check_widevine(self):
 
         if cdm_from_repo():  # check that widevine arch matches system arch
             wv_config = load_widevine_config()
+            log(0, "temporary logging")
+            log(4, wv_config)
+            log(4, wv_config["os"])
+            log(4, wv_config["name"])
+            log(4, wv_config["arch"])
             if config.WIDEVINE_ARCH_MAP_REPO[arch()] != wv_config['arch']:
                 log(4, 'Widevine/system arch mismatch. Reinstall is required.')
                 ok_dialog(localize(30001), localize(30031))  # An update of Widevine is required