Less verbose output in roundtrip testing

Author: rocky

test/Makefile

@@ -27,7 +27,12 @@ check: check-short check-roundtrip
                   --bytecode-pypy35 --bytecode-pypy36 --bytecode-pypy37 \
                   --bytecode-pypy38 --bytecode-pypy39 --bytecode-pypy310 $(COMPILE)
 
-check-roundtrip: check-roundtrip-3.0 check-roundtrip-3.1 check-roundtrip-3.3 check-roundtrip-3.4
+check-roundtrip:
+	./test_pyc_roundtrip.py --quiet \
+        --bytecode-2.7 --bytecode-3.0 --bytecode-3.1 --bytecode-3.3 --bytecode-3.4
+
+check-roundtrip-2.7:
+	./test_pyc_roundtrip.py --bytecode-3.0
 
 check-roundtrip-3.0:
 	./test_pyc_roundtrip.py --bytecode-3.0

test/test_pyc_roundtrip.py

@@ -190,7 +190,7 @@ def file_matches(files, root, basenames, patterns):
     failure_count = 0
     try:
         for infile in files:
-            failure_count += roundtrip_pyc(infile, unlink_on_success=False)
+            failure_count += roundtrip_pyc(infile, unlink_on_success=False, verbose=test_opts["verbose"])
 
     except (KeyboardInterrupt, OSError):
         print()
@@ -200,7 +200,7 @@ def file_matches(files, root, basenames, patterns):
 
     n = len(files)
     print(f"Processed {n} files: {n-failure_count} good, and {failure_count} bad.")
-    sys.exit(failure_count if failure_count < 255 else 255)
+    return failure_count
 
 
 if __name__ == "__main__":
@@ -213,7 +213,7 @@ def file_matches(files, root, basenames, patterns):
     opts, args = getopt.getopt(
         sys.argv[1:],
         "",
-        ["start-with=", "all", "no-rm"] + test_options_keys,
+        ["start-with=", "all", "quiet", "no-rm"] + test_options_keys,
     )
     if not opts:
         help()
@@ -223,11 +223,14 @@ def file_matches(files, root, basenames, patterns):
         "rmtree": True,
     }
 
+    test_opts["verbose"] = True
     for opt, val in opts:
         if opt == "--start-with":
             test_opts["start_with"] = val
         elif opt == "--no-rm":
             test_opts["rmtree"] = False
+        elif opt == "--quiet":
+            test_opts["verbose"] = False
         elif opt[2:] in test_options_keys:
             test_dirs.append(test_options[opt[2:]])
         elif opt == "--all":

xdis/roundtrip_pyc.py

@@ -179,7 +179,7 @@ def load_meta_and_code_from_filename(path: str):
         return load_module_from_file_object(fp, filename=path, get_code=True)
 
 
-def roundtrip_pyc(input_path: str, unlink_on_success: bool) -> int:
+def roundtrip_pyc(input_path: str, unlink_on_success: bool, verbose: bool) -> int:
 
     # parser = argparse.ArgumentParser(
     #     description="Load a .pyc with xdis, rewrite it to a temporary file, and compare."
@@ -262,8 +262,9 @@ def roundtrip_pyc(input_path: str, unlink_on_success: bool) -> int:
         print(f"WARNING: could not do raw byte comparison: {e}", file=sys.stderr)
 
     print("Original file:", input_path)
-    print("Rewritten file:", tf_name)
-    print("Raw-bytes identical:", same_bytes)
+    if verbose:
+        print("Rewritten file:", tf_name)
+        print("Raw-bytes identical:", same_bytes)
     if same_bytes:
         if unlink_on_success:
             os.unlink(tf_name)