From a9c5d889b9d356ec0cd8c4bac1ea9e527baa3b1a Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 20 Oct 2025 14:45:32 +0100 Subject: [PATCH] [Test] Disable milter mode in proxy worker for integration tests Remove 'milter = yes' from proxy worker configuration to enable HTTP protocol testing. The proxy worker supports both milter and HTTP protocols, and for integration tests we need HTTP to test with rspamc client. Also enable proxy test by default now that it works correctly. --- test/integration/configs/worker-proxy.inc | 3 --- test/integration/scripts/integration-test.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test/integration/configs/worker-proxy.inc b/test/integration/configs/worker-proxy.inc index c12f041426..4a138c1813 100644 --- a/test/integration/configs/worker-proxy.inc +++ b/test/integration/configs/worker-proxy.inc @@ -8,9 +8,6 @@ upstream "local" { self_scan = yes; } -#Enable milter protocol -milter = yes; - #Enable encryption for proxy connections keypair { pubkey = "{= env.PROXY_PUBKEY =}"; diff --git a/test/integration/scripts/integration-test.sh b/test/integration/scripts/integration-test.sh index 083136f9fd..30b1694a0c 100755 --- a/test/integration/scripts/integration-test.sh +++ b/test/integration/scripts/integration-test.sh @@ -14,7 +14,7 @@ PROXY_PORT=${PROXY_PORT:-50004} PASSWORD=${PASSWORD:-q1} PARALLEL=${PARALLEL:-10} TRAIN_RATIO=${TRAIN_RATIO:-0.1} -TEST_PROXY=${TEST_PROXY:-false} +TEST_PROXY=${TEST_PROXY:-true} # Directories # When running inside container via stdin, BASH_SOURCE won't work properly -- 2.47.3