tests: venv mitmproxy to avoid conflict

This commit is contained in:
lilydjwg 2025-02-10 16:18:32 +08:00
parent 6759d2f206
commit 72c0730725
2 changed files with 9 additions and 4 deletions

View file

@ -75,8 +75,9 @@ jobs:
${{ env.cache-name }}- ${{ env.cache-name }}-
- name: Install mitmproxy - name: Install mitmproxy
run: | run: |
sudo apt update /usr/bin/python -m venv --system-site-packages ~/.mitmproxy/venv
/usr/bin/pip install -U mitmproxy . ~/.mitmproxy/venv/bin/activate
pip install -U mitmproxy
# https://github.com/DevToys-app/DevToys/issues/1373#issuecomment-2599820594 # 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_unconfined=0
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
@ -84,4 +85,6 @@ jobs:
# - name: Setup upterm session # - name: Setup upterm session
# uses: lhotari/action-upterm@v1 # uses: lhotari/action-upterm@v1
- name: Run pytest - name: Run pytest
env:
mitmdump: /home/runner/.mitmproxy/venv/bin/mitmdump
run: scripts/run_cached_tests run: scripts/run_cached_tests

View file

@ -1,9 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
mitmdump=${mitmdump:-mitmdump}
if [[ -f ~/.mitmproxy/nvdump ]]; then 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 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 fi
mitm_pid=$! mitm_pid=$!