diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f1ac8782f..56bef6024 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -115,8 +115,8 @@ PORT=8080 vendor/bin/start.sh export "REQUESTS_TEST_HOST_HTTP=localhost:8080" # Start the proxy server -PORT=9002 tests/utils/proxy/start.sh -PORT=9003 AUTH="test:pass" tests/utils/proxy/start.sh +PORT=9002 scripts/proxy/start.sh +PORT=9003 AUTH="test:pass" scripts/proxy/start.sh export "REQUESTS_HTTP_PROXY=localhost:9002" export "REQUESTS_HTTP_PROXY_AUTH=localhost:9003" export "REQUESTS_HTTP_PROXY_AUTH_USER=test" @@ -126,8 +126,8 @@ export "REQUESTS_HTTP_PROXY_AUTH_PASS=pass" composer test # Stop the proxy server -PORT=9002 tests/utils/proxy/stop.sh -PORT=9003 tests/utils/proxy/stop.sh +PORT=9002 scripts/proxy/stop.sh +PORT=9003 scripts/proxy/stop.sh # Stop the test server vendor/bin/stop.sh diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index fae653090..7fc8de4f0 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -74,8 +74,8 @@ jobs: - name: Start proxy server run: | - PORT=9002 tests/utils/proxy/start.sh - PORT=9003 AUTH="test:pass" tests/utils/proxy/start.sh + PORT=9002 scripts/proxy/start.sh + PORT=9003 AUTH="test:pass" scripts/proxy/start.sh echo "REQUESTS_HTTP_PROXY=localhost:9002" >> "$GITHUB_ENV" echo "REQUESTS_HTTP_PROXY_AUTH=localhost:9003" >> "$GITHUB_ENV" echo "REQUESTS_HTTP_PROXY_AUTH_USER=test" >> "$GITHUB_ENV" @@ -105,8 +105,8 @@ jobs: - name: Stop proxy server continue-on-error: true run: | - PORT=9002 tests/utils/proxy/stop.sh - PORT=9003 tests/utils/proxy/stop.sh + PORT=9002 scripts/stop.sh + PORT=9003 scripts/stop.sh - name: Stop test server continue-on-error: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e04b5de2..59254f16d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,8 +98,8 @@ jobs: - name: Start proxy server run: | - PORT=9002 tests/utils/proxy/start.sh - PORT=9003 AUTH="test:pass" tests/utils/proxy/start.sh + PORT=9002 scripts/proxy/start.sh + PORT=9003 AUTH="test:pass" scripts/proxy/start.sh echo "REQUESTS_HTTP_PROXY=localhost:9002" >> "$GITHUB_ENV" echo "REQUESTS_HTTP_PROXY_AUTH=localhost:9003" >> "$GITHUB_ENV" echo "REQUESTS_HTTP_PROXY_AUTH_USER=test" >> "$GITHUB_ENV" @@ -137,8 +137,8 @@ jobs: - name: Stop proxy server continue-on-error: true run: | - PORT=9002 tests/utils/proxy/stop.sh - PORT=9003 tests/utils/proxy/stop.sh + PORT=9002 scripts/proxy/stop.sh + PORT=9003 scripts/proxy/stop.sh - name: Stop test server continue-on-error: true diff --git a/.gitignore b/.gitignore index 8f4479dd1..055b75f0c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,5 +25,5 @@ build/ghpages/artifacts certificates/etag-*.txt # Ignore temporary files generated by the testing proxy. -tests/utils/proxy/__pycache__ -tests/utils/proxy/*.pid +scripts/proxy/__pycache__ +scripts/proxy/*.pid diff --git a/tests/utils/proxy/proxy.py b/scripts/proxy/proxy.py similarity index 100% rename from tests/utils/proxy/proxy.py rename to scripts/proxy/proxy.py diff --git a/tests/utils/proxy/start.sh b/scripts/proxy/start.sh similarity index 100% rename from tests/utils/proxy/start.sh rename to scripts/proxy/start.sh diff --git a/tests/utils/proxy/stop.sh b/scripts/proxy/stop.sh similarity index 100% rename from tests/utils/proxy/stop.sh rename to scripts/proxy/stop.sh