From 4eee4c81ac91449b1b26f13da25bb541b33eda21 Mon Sep 17 00:00:00 2001 From: Lukasz Nowak <luke@nexedi.com> Date: Fri, 12 Apr 2019 12:13:45 +0200 Subject: [PATCH] fixup! caddy-frontend: Disable ATS cache promise plugin --- ...estDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt | 1 - ...DuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt | 1 - ...Http2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt | 1 - ...ultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt | 1 - ...leHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt | 1 - ...lseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt | 1 - ...estMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt | 1 - .../test.TestMasterRequest.test_promise_run_plugin-CADDY.txt | 1 - ...st.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt | 1 - .../test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt | 1 - ...erificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt | 1 - ...tRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt | 1 - .../test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt | 2 -- .../test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt | 1 - ...est.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt | 1 - ...estSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt | 1 - ...erCertificateCompatibility.test_promise_run_plugin-CADDY.txt | 1 - ...ompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt | 1 - ...ificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt | 1 - 19 files changed, 20 deletions(-) diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt index a266b8f09..0729809e4 100644 --- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt index 8b88c3338..ea590bb61 100644 --- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt index 9058b901c..1a27283c6 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt @@ -25,5 +25,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt index 9058b901c..1a27283c6 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt @@ -25,5 +25,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt index 9058b901c..1a27283c6 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt @@ -25,5 +25,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt index 9058b901c..1a27283c6 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt @@ -25,5 +25,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt index b833e730d..108716271 100644 --- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt index 8095c9743..9a353c40a 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt @@ -19,5 +19,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt index 8095c9743..9a353c40a 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt @@ -19,5 +19,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt index b9828adca..2f288ed42 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt index 5c4a380d0..962cc9356 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt index 0a0dbb50e..913520973 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: ERROR -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt index b2c8ee839..9abbe41ef 100644 --- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt @@ -21,7 +21,6 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK T-3/etc/plugin/buildout-T-3-status.py: OK T-3/etc/plugin/caddy_cached.py: OK @@ -42,5 +41,4 @@ T-3/etc/plugin/nginx_frontend_ipv4_https.py: OK T-3/etc/plugin/nginx_frontend_ipv6_http.py: OK T-3/etc/plugin/nginx_frontend_ipv6_https.py: OK T-3/etc/plugin/re6st-connectivity.py: OK -T-3/etc/plugin/trafficserver-cache-availability.py: OK T-3/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt index b36bde209..52b940d30 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt @@ -112,5 +112,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt index fe6d2858b..b72c6e6cf 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt @@ -38,5 +38,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt index b36bde209..52b940d30 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt @@ -112,5 +112,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt index faacf5ce5..16ed66c38 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt @@ -43,5 +43,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt index bf874f6b9..e9d2996c8 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt index 4fa3c5113..b3f72a75b 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt @@ -21,5 +21,4 @@ T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK T-2/etc/plugin/re6st-connectivity.py: OK -T-2/etc/plugin/trafficserver-cache-availability.py: OK T-2/etc/plugin/trafficserver-port-listening.py: OK \ No newline at end of file -- 2.30.9