From 72c07307252f1225e64f17ea76a9d65cd97f6e78 Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Mon, 10 Feb 2025 16:18:32 +0800 Subject: [PATCH] tests: venv mitmproxy to avoid conflict --- .github/workflows/tests.yaml | 7 +++++-- scripts/run_cached_tests | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4fa8d11..3e2aaaa 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -75,8 +75,9 @@ 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/bin/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 @@ -84,4 +85,6 @@ jobs: # - name: Setup upterm session # uses: lhotari/action-upterm@v1 - name: Run pytest + env: + mitmdump: /home/runner/.mitmproxy/venv/bin/mitmdump run: scripts/run_cached_tests diff --git a/scripts/run_cached_tests b/scripts/run_cached_tests index d572514..f455da1 100755 --- 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=$!