move msgs functions below the setup/cleanup funcs

Author: mplsgrant

test/test_base.py

@@ -46,19 +46,6 @@ def setup_logging(self):
         self.log = logging.getLogger("test")
         self.log.info("Logging started")
 
-    def _print_and_assert_msgs(self, message):
-        if (self.log_expected_msgs or self.log_unexpected_msgs) and assert_log(
-            message, self.log_expected_msgs, self.log_unexpected_msgs
-        ):
-            self.log_msg_assertions_passed = True
-        print(message)
-
-    def assert_log_msgs(self):
-        assert (
-            self.log_msg_assertions_passed
-        ), f"Log assertion failed. Expected message not found: {self.log_expected_msgs}"
-        self.log_msg_assertions_passed = False
-
     def cleanup(self, signum=None, frame=None):
         if self.server is None:
             return
@@ -76,6 +63,19 @@ def cleanup(self, signum=None, frame=None):
             self.server_thread.join()
             self.server = None
 
+    def _print_and_assert_msgs(self, message):
+        if (self.log_expected_msgs or self.log_unexpected_msgs) and assert_log(
+            message, self.log_expected_msgs, self.log_unexpected_msgs
+        ):
+            self.log_msg_assertions_passed = True
+        print(message)
+
+    def assert_log_msgs(self):
+        assert (
+            self.log_msg_assertions_passed
+        ), f"Log assertion failed. Expected message not found: {self.log_expected_msgs}"
+        self.log_msg_assertions_passed = False
+
     def warcli(self, cmd, network=True):
         self.log.debug(f"Executing warcli command: {cmd}")
         command = ["warcli"] + cmd.split()