From a9e6aefa7ee940f291b186d982d2462d93e7c1c5 Mon Sep 17 00:00:00 2001
From: Lukasz Nowak <luke@nexedi.com>
Date: Mon, 4 Mar 2019 10:39:53 +0100
Subject: [PATCH] fixup! Fix "caddy-frontend/test: Assert promises"

---
 ...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 -
 16 files changed, 17 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 f6f7ff07b..aa60d1be4 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 @@ TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv4_https.py: ERROR
 TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_http.py: ERROR
 TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_https.py: ERROR
 TestDefaultMonitorHttpdPort-1/etc/plugin/re6st-connectivity.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ 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 77d4a30b4..2ab054185 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 @@ TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestDuplicateSiteKeyProtection-1/etc/plugin/re6st-connectivity.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestDuplicateSiteKeyProtection-1/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 d9e049158..5037c2874 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 @@ TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py:
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ 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 a61444688..f7f17c921 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 @@ TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_fronte
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/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 e25944a85..c6976c7b8 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 @@ TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestEnableHttp2ByDefaultFalseSlave-1/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 97a687fc1..890adc0d7 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 @@ TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/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 53087dd6f..dcac0473e 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 @@ TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestMalformedBackenUrlSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestMalformedBackenUrlSlave-1/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 d06b09752..83f892a0e 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 @@ TestMasterRequest-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestMasterRequest-1/etc/plugin/re6st-connectivity.py: OK
-TestMasterRequest-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestMasterRequest-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ 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 03bdbc863..76fcecfd5 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 @@ TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestMasterRequestDomain-1/etc/plugin/re6st-connectivity.py: OK
-TestMasterRequestDomain-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestMasterRequestDomain-1/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 0cf70d845..79c89cd9d 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 @@ TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestQuicEnabled-1/etc/plugin/re6st-connectivity.py: OK
-TestQuicEnabled-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestQuicEnabled-1/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 1ee9a766d..90a1f187b 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 @@ TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py:
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ 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 48ba1b9c4..0beef11d6 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 @@ TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestRe6stVerificationUrlSlave-1/etc/plugin/re6st-connectivity.py: ERROR
-TestRe6stVerificationUrlSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestRe6stVerificationUrlSlave-1/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 d01a6fe3f..24f5a9fba 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 @@ TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestReplicateSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestReplicateSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestReplicateSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
 TestReplicateSlave-2/etc/plugin/buildout-TestReplicateSlave-2-status.py: OK
 TestReplicateSlave-2/etc/plugin/caddy_cached.py: ERROR
@@ -42,5 +41,4 @@ TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestReplicateSlave-2/etc/plugin/re6st-connectivity.py: OK
-TestReplicateSlave-2/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestReplicateSlave-2/etc/plugin/trafficserver-port-listening.py: ERROR
\ 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 0e00f3477..db4297a80 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
@@ -110,5 +110,4 @@ TestSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestSlave-1/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 1113e9d34..aa9d6535f 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 @@ TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestSlaveBadParameters-1/etc/plugin/re6st-connectivity.py: OK
-TestSlaveBadParameters-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestSlaveBadParameters-1/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 4463055bc..fe37a409c 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
@@ -110,5 +110,4 @@ TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
 TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
 TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
 TestSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py: ERROR
 TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
-- 
2.30.9