caddy-frontend/test: Fix file formatting

software/caddy-frontend/test/test.py

@@ -559,9 +559,12 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
       cls.waitForCaddy()
     except BaseException:
       cls.logger.exception("Error during setUpClass")
-      # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used by SlapOSInstanceTestCase.setUpClass
-      # so we use another name for snapshot, to make sure we don't store another snapshot in same directory.
-      cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format(cls.__module__, cls.__name__))
+      # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used
+      # by SlapOSInstanceTestCase.setUpClass so we use another name for
+      # snapshot, to make sure we don't store another snapshot in same
+      # directory.
+      cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format(
+        cls.__module__, cls.__name__))
       cls.setUp = lambda self: self.fail('Setup Class failed.')
       raise
 

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt

@@ -2,3 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

@@ -2,3 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt

@@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt

@@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
+T-2:trafficserver-reload EXITED
\ No newline at end of file