From 443eeadc1e97a054b171cb78280ad2309549fe6d Mon Sep 17 00:00:00 2001 From: Lukasz Nowak <luke@nexedi.com> Date: Tue, 11 Dec 2018 15:17:15 +0100 Subject: [PATCH] caddy-frontend/test: Ignore disappearing file --- software/caddy-frontend/test/test.py | 3 +++ ...TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt | 2 -- ...ableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt | 2 -- ...EnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt | 2 -- ...st.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt | 2 -- .../test.TestQuicEnabled.test_file_list_run-CADDY.txt | 2 -- ...6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt | 2 -- ....TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt | 2 -- .../test.TestReplicateSlave.test_file_list_run-CADDY.txt | 2 -- .../test/test_data/test.TestSlave.test_file_list_run-CADDY.txt | 2 -- .../test.TestSlaveBadParameters.test_file_list_run-CADDY.txt | 2 -- 11 files changed, 3 insertions(+), 20 deletions(-) diff --git a/software/caddy-frontend/test/test.py b/software/caddy-frontend/test/test.py index 269034262..e66bdba2d 100644 --- a/software/caddy-frontend/test/test.py +++ b/software/caddy-frontend/test/test.py @@ -310,6 +310,9 @@ class TestDataMixin(object): self._test_file_list('run', [ # run by cron from time to time 'monitor/monitor-collect.pid', + # may appear or not + 'var/run/caddy_graceful_signature.tmp', + 'var/run/nginx_graceful_signature.tmp', ]) def test_supervisor_state(self): diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt index 7e14aaaf1..0a239cb05 100644 --- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestDuplicateSiteKeyProtection-0/var/run/monitor-httpd.pid TestDuplicateSiteKeyProtection-0/var/run/monitor/monitor-bootstrap.pid TestDuplicateSiteKeyProtection-1/var/run/caddy_graceful_signature -TestDuplicateSiteKeyProtection-1/var/run/caddy_graceful_signature.tmp TestDuplicateSiteKeyProtection-1/var/run/caddy_validate_signature TestDuplicateSiteKeyProtection-1/var/run/caddy_validate_signature.status TestDuplicateSiteKeyProtection-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestDuplicateSiteKeyProtection-1/var/run/monitor-httpd.pid TestDuplicateSiteKeyProtection-1/var/run/monitor/monitor-bootstrap.pid TestDuplicateSiteKeyProtection-1/var/run/nginx.pid TestDuplicateSiteKeyProtection-1/var/run/nginx_graceful_signature -TestDuplicateSiteKeyProtection-1/var/run/nginx_graceful_signature.tmp TestDuplicateSiteKeyProtection-1/var/run/nginx_validate_signature TestDuplicateSiteKeyProtection-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt index 78243f763..dbfe1a8cc 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor-httpd.pid TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_graceful_signature -TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_graceful_signature.tmp TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_validate_signature TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_validate_signature.status TestEnableHttp2ByDefaultDefaultSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor-httpd.pid TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx.pid TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_graceful_signature -TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_graceful_signature.tmp TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_validate_signature TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt index 8b00c8e4d..d154b74d1 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor-httpd.pid TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor/monitor-bootstrap.pid TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_graceful_signature -TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_graceful_signature.tmp TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_validate_signature TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_validate_signature.status TestEnableHttp2ByDefaultFalseSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor-httpd.pid TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor/monitor-bootstrap.pid TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx.pid TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_graceful_signature -TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_graceful_signature.tmp TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_validate_signature TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt index 2dd96cf77..a21a022d6 100644 --- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestMalformedBackenUrlSlave-0/var/run/monitor-httpd.pid TestMalformedBackenUrlSlave-0/var/run/monitor/monitor-bootstrap.pid TestMalformedBackenUrlSlave-1/var/run/caddy_graceful_signature -TestMalformedBackenUrlSlave-1/var/run/caddy_graceful_signature.tmp TestMalformedBackenUrlSlave-1/var/run/caddy_validate_signature TestMalformedBackenUrlSlave-1/var/run/caddy_validate_signature.status TestMalformedBackenUrlSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestMalformedBackenUrlSlave-1/var/run/monitor-httpd.pid TestMalformedBackenUrlSlave-1/var/run/monitor/monitor-bootstrap.pid TestMalformedBackenUrlSlave-1/var/run/nginx.pid TestMalformedBackenUrlSlave-1/var/run/nginx_graceful_signature -TestMalformedBackenUrlSlave-1/var/run/nginx_graceful_signature.tmp TestMalformedBackenUrlSlave-1/var/run/nginx_validate_signature TestMalformedBackenUrlSlave-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt index 245dc9d43..196b55ea1 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestQuicEnabled-0/var/run/monitor-httpd.pid TestQuicEnabled-0/var/run/monitor/monitor-bootstrap.pid TestQuicEnabled-1/var/run/caddy_graceful_signature -TestQuicEnabled-1/var/run/caddy_graceful_signature.tmp TestQuicEnabled-1/var/run/caddy_validate_signature TestQuicEnabled-1/var/run/caddy_validate_signature.status TestQuicEnabled-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestQuicEnabled-1/var/run/monitor-httpd.pid TestQuicEnabled-1/var/run/monitor/monitor-bootstrap.pid TestQuicEnabled-1/var/run/nginx.pid TestQuicEnabled-1/var/run/nginx_graceful_signature -TestQuicEnabled-1/var/run/nginx_graceful_signature.tmp TestQuicEnabled-1/var/run/nginx_validate_signature TestQuicEnabled-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt index 0482a3f9b..e417aeaff 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor-httpd.pid TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature -TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature.tmp TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature.status TestRe6stVerificationUrlDefaultSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor-httpd.pid TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx.pid TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature -TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature.tmp TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt index a6e720014..80a3dd435 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestRe6stVerificationUrlSlave-0/var/run/monitor-httpd.pid TestRe6stVerificationUrlSlave-0/var/run/monitor/monitor-bootstrap.pid TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature -TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature.tmp TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature.status TestRe6stVerificationUrlSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestRe6stVerificationUrlSlave-1/var/run/monitor-httpd.pid TestRe6stVerificationUrlSlave-1/var/run/monitor/monitor-bootstrap.pid TestRe6stVerificationUrlSlave-1/var/run/nginx.pid TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature -TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature.tmp TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature.status diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt index 3bb17bc37..d0cfd356a 100644 --- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestReplicateSlave-0/var/run/monitor-httpd.pid TestReplicateSlave-0/var/run/monitor/monitor-bootstrap.pid TestReplicateSlave-1/var/run/caddy_graceful_signature -TestReplicateSlave-1/var/run/caddy_graceful_signature.tmp TestReplicateSlave-1/var/run/caddy_validate_signature TestReplicateSlave-1/var/run/caddy_validate_signature.status TestReplicateSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestReplicateSlave-1/var/run/monitor-httpd.pid TestReplicateSlave-1/var/run/monitor/monitor-bootstrap.pid TestReplicateSlave-1/var/run/nginx.pid TestReplicateSlave-1/var/run/nginx_graceful_signature -TestReplicateSlave-1/var/run/nginx_graceful_signature.tmp TestReplicateSlave-1/var/run/nginx_validate_signature TestReplicateSlave-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt index 7594246e0..f8cd35647 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestSlave-0/var/run/monitor-httpd.pid TestSlave-0/var/run/monitor/monitor-bootstrap.pid TestSlave-1/var/run/caddy_graceful_signature -TestSlave-1/var/run/caddy_graceful_signature.tmp TestSlave-1/var/run/caddy_validate_signature TestSlave-1/var/run/caddy_validate_signature.status TestSlave-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestSlave-1/var/run/monitor-httpd.pid TestSlave-1/var/run/monitor/monitor-bootstrap.pid TestSlave-1/var/run/nginx.pid TestSlave-1/var/run/nginx_graceful_signature -TestSlave-1/var/run/nginx_graceful_signature.tmp TestSlave-1/var/run/nginx_validate_signature TestSlave-1/var/run/nginx_validate_signature.status \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt index 085d557fc..919fec50f 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt @@ -1,7 +1,6 @@ TestSlaveBadParameters-0/var/run/monitor-httpd.pid TestSlaveBadParameters-0/var/run/monitor/monitor-bootstrap.pid TestSlaveBadParameters-1/var/run/caddy_graceful_signature -TestSlaveBadParameters-1/var/run/caddy_graceful_signature.tmp TestSlaveBadParameters-1/var/run/caddy_validate_signature TestSlaveBadParameters-1/var/run/caddy_validate_signature.status TestSlaveBadParameters-1/var/run/httpd.pid @@ -9,6 +8,5 @@ TestSlaveBadParameters-1/var/run/monitor-httpd.pid TestSlaveBadParameters-1/var/run/monitor/monitor-bootstrap.pid TestSlaveBadParameters-1/var/run/nginx.pid TestSlaveBadParameters-1/var/run/nginx_graceful_signature -TestSlaveBadParameters-1/var/run/nginx_graceful_signature.tmp TestSlaveBadParameters-1/var/run/nginx_validate_signature TestSlaveBadParameters-1/var/run/nginx_validate_signature.status \ No newline at end of file -- 2.30.9