[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.

diff --git a/test/integration/configs/worker-proxy.inc b/test/integration/configs/worker-proxy.inc
index c12f041426777c6f0ffd3abc6eb1533e9412b7e3..4a138c1813bdb7b29bcc1781817a8e5c1929ae77 100644 (file)
--- 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 083136f9fd3d01312d1fc42d27beac7c0718d12c..30b1694a0c9a95e0d7a6f3caff8d95bced159c74 100755 (executable)
--- 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