tests: venv mitmproxy to avoid conflict

lilydjwg · Feb 10, 2025 · 4388f01 · 4388f01
1 parent 988c060
commit 4388f01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -75,13 +75,16 @@ jobs:
           ${{ env.cache-name }}-
     - name: Install mitmproxy
       run: |
-        sudo apt update
-        /usr/bin/pip install -U mitmproxy
+        /usr/bin/python -m venv --system-site-packages ~/.mitmproxy/venv
+        . ~/.mitmproxy/venv/activate
+        pip install -U mitmproxy
         # https://github.com/DevToys-app/DevToys/issues/1373#issuecomment-2599820594
         sudo sysctl -w kernel.apparmor_restrict_unprivileged_unconfined=0
         sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
     - name: Setup upterm session
       uses: lhotari/action-upterm@v1
     - name: Run pytest
+      env:
+        mitmdump: ~/.mitmproxy/venv/bin/mitmdump
       run: scripts/run_cached_tests
diff --git a/scripts/run_cached_tests b/scripts/run_cached_tests
@@ -1,9 +1,11 @@
 #!/bin/bash -e
 
+mitmdump=${mitmdump:-mitmdump}
+
 if [[ -f ~/.mitmproxy/nvdump ]]; then
-  mitmdump -S ~/.mitmproxy/nvdump -p 7890 --ignore-hosts '127\.0\.0\.1' --server-replay-reuse --server-replay-extra=forward -w newdump >/dev/null &
+  $mitmdump -S ~/.mitmproxy/nvdump -p 7890 --ignore-hosts '127\.0\.0\.1' --server-replay-reuse --server-replay-extra=forward -w newdump >/dev/null &
 else
-  mitmdump -w ~/.mitmproxy/nvdump -p 7890 --ignore-hosts '127\.0\.0\.1' >/dev/null &
+  $mitmdump -w ~/.mitmproxy/nvdump -p 7890 --ignore-hosts '127\.0\.0\.1' >/dev/null &
 fi
 
 mitm_pid=$!