Fix feedback formatting issue

cmput415 · Dec 10, 2024 · f27136d · f27136d
1 parent 11a8549
commit f27136d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/dragon_runner/cli.py b/dragon_runner/cli.py
@@ -52,7 +52,8 @@ def parse_cli_args() -> CLIArgs:
         help="Path to the tester JSON configuration file (required for regular and tournament modes).")
 
     parser.add_argument("--mode", dest="mode", default="regular",
-        help="run in regular, tournament or script mode")
+                        help="run in one of the test-running modes: [regular, tournament, perf, memcheck]\
+                              or in a scripting mode")
 
     parser.add_argument("--script-args", type=parse_script_args, default=[],
         help='Arguments to pass to the script (quote the entire string, e.g. --script-args="arg1 arg2")')

diff --git a/dragon_runner/harness.py b/dragon_runner/harness.py
@@ -219,18 +219,16 @@ def trim_bytes(data: bytes, max_bytes: int = 512) -> bytes:
             if not result.did_pass:
                 test_contents = file_to_str(result.test.path)
                 exp_out = trim_bytes(x) if isinstance(x := result.test.expected_out, bytes) else ""
-                gen_out = trim_bytes(x) if isinstance(x := result.gen_output, bytes) else ""
-
-                feedback_file.write(
-                    f"""Test: {result.test.file}\n
-                        Test contents: {test_contents}\n
-                        Expected Output: {exp_out}\n
-                        Generated Output: {gen_out} 
-                    """
+                gen_out = trim_bytes(x) if isinstance(x := result.gen_output, bytes) else ""               
+                feedback_string = (
+                  "="*40+'\n'
+                  f"Test: {result.test.file}\n"
+                  f"Test Contents: {test_contents.strip()}\n"
+                  f"Expected Output: {exp_out.strip()}\n"
+                  f"Generated Output: {gen_out.strip()}\n"
                 )
-                if result.failing_step:
-                    feedback_file.write(f"Failing Step: {result.failing_step}\n")
-                feedback_file.write("\n")
+
+                feedback_file.write(feedback_string)
 
 class MemoryCheckHarness(TestHarness):