system-tests: add debug flag

system/api_lib.py

@@ -25,7 +25,7 @@ class APITest(BaseTest):
     """
     aptly_server = None
     aptly_out = None
-    debugOutput = True
+    debugOutput = False  # Controlled by --debug flag in run.py
     base_url = "127.0.0.1:8765"
     configOverride = {
         "FileSystemPublishEndpoints": {

system/run.py

@@ -36,7 +36,7 @@ def natural_key(string_):
     return [int(s) if s.isdigit() else s for s in re.split(r'(\d+)', string_)]
 
 
-def run(include_long_tests=False, capture_results=False, tests=None, filters=None, coverage_dir=None, coverage_skip=False):
+def run(include_long_tests=False, capture_results=False, tests=None, filters=None, coverage_dir=None, coverage_skip=False, debug=False):
     """
     Run system test.
     """
@@ -50,6 +50,9 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non
     if not coverage_dir and not coverage_skip:
         coverage_dir = mkdtemp(suffix="aptly-coverage")
 
+    # Set debug output globally for all test classes
+    BaseTest.debugOutput = debug
+
     failed = False
     for test in tests:
         orig_stdout = sys.stdout
@@ -215,6 +218,7 @@ if __name__ == "__main__":
     capture_results = False
     coverage_dir = None
     coverage_skip = False
+    debug = False
     tests = None
     args = sys.argv[1:]
 
@@ -228,6 +232,8 @@ if __name__ == "__main__":
             args = args[1:]
         elif args[0] == "--coverage-skip":
             coverage_skip = True
+        elif args[0] == "--debug":
+            debug = True
 
         args = args[1:]
 
@@ -240,4 +246,4 @@ if __name__ == "__main__":
         else:
             filters.append(arg)
 
-    run(include_long_tests, capture_results, tests, filters, coverage_dir, coverage_skip)
+    run(include_long_tests, capture_results, tests, filters, coverage_dir, coverage_skip, debug)

system/t12_api/unix_socket.py

@@ -14,7 +14,7 @@ class UnixSocketAPITest(BaseTest):
     socket_path = "/tmp/_aptly_test.sock"
     base_url = ("unix://%s" % socket_path)
     aptly_out = None
-    debugOutput = True
+    debugOutput = False  # Controlled by --debug flag in run.py
 
     def prepare(self):
         if self.aptly_server is None: