From bd3f0360e47cfa7b6ba4d160028379af9a33a31a Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Tue, 28 Oct 2025 18:07:38 +0100 Subject: [PATCH] maybe not needed? --- .github/workflows/test-stack-reusable-workflow.yml | 6 +++--- changedetectionio/run_proxy_tests.sh | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-stack-reusable-workflow.yml b/.github/workflows/test-stack-reusable-workflow.yml index e82be2ed..a48e3c91 100644 --- a/.github/workflows/test-stack-reusable-workflow.yml +++ b/.github/workflows/test-stack-reusable-workflow.yml @@ -285,9 +285,9 @@ jobs: - name: Spin up services run: | docker network create changedet-network - docker run --network changedet-network -d --hostname selenium -p 4444:4444 --rm --shm-size="2g" selenium/standalone-chrome:4 - docker run --network changedet-network -d -e "LOG_LEVEL=TRACE" --cap-add=SYS_ADMIN --name sockpuppetbrowser --hostname sockpuppetbrowser --rm -p 3000:3000 dgtlmoon/sockpuppetbrowser:latest - docker run --network changedet-network -d -e "LOG_LEVEL=TRACE" --cap-add=SYS_ADMIN --name sockpuppetbrowser-custom-url --hostname sockpuppetbrowser-custom-url -p 3001:3000 --rm dgtlmoon/sockpuppetbrowser:latest +# docker run --network changedet-network -d --hostname selenium -p 4444:4444 --rm --shm-size="2g" selenium/standalone-chrome:4 +# docker run --network changedet-network -d -e "LOG_LEVEL=TRACE" --cap-add=SYS_ADMIN --name sockpuppetbrowser --hostname sockpuppetbrowser --rm -p 3000:3000 dgtlmoon/sockpuppetbrowser:latest +# docker run --network changedet-network -d -e "LOG_LEVEL=TRACE" --cap-add=SYS_ADMIN --name sockpuppetbrowser-custom-url --hostname sockpuppetbrowser-custom-url -p 3001:3000 --rm dgtlmoon/sockpuppetbrowser:latest - name: Test proxy Squid style interaction run: | diff --git a/changedetectionio/run_proxy_tests.sh b/changedetectionio/run_proxy_tests.sh index bb971d52..a0e781e8 100755 --- a/changedetectionio/run_proxy_tests.sh +++ b/changedetectionio/run_proxy_tests.sh @@ -5,8 +5,6 @@ set -e # enable debug set -x -docker network inspect changedet-network >/dev/null 2>&1 || docker network create changedet-network - # Test proxy list handling, starting two squids on different ports # Each squid adds a different header to the response, which is the main thing we test for. docker run --network changedet-network -d --name squid-one --hostname squid-one --rm -v `pwd`/tests/proxy_list/squid.conf:/etc/squid/conf.d/debian.conf ubuntu/squid:4.13-21.10_edge @@ -23,6 +21,7 @@ docker run --network changedet-network -d \ ## 2nd test actually choose the preferred proxy from proxies.json +# This will force a request via "proxy-two" docker run --network changedet-network \ -v `pwd`/tests/proxy_list/proxies.json-example:/app/changedetectionio/test-datastore/proxies.json \ test-changedetectionio \