resolving conflicts in changelog

MarkUsProject · Sep 24, 2024 · cf2f22e · cf2f22e
2 parents 208799b + 1b2c04e
commit cf2f22e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,7 @@
 All notable changes to this project will be documented here.
 
 ## [unreleased]
+- Haskell Tests - allow displaying of compilation errors (#554)
 - Add status api for monitoring if Gunicorn is down (#555)
 
 ## [v2.5.1]

diff --git a/server/autotest_server/testers/haskell/haskell_tester.py b/server/autotest_server/testers/haskell/haskell_tester.py
@@ -120,16 +120,14 @@ def run_haskell_tests(self) -> Dict[str, List[Dict[str, Union[int, str]]]]:
                 subprocess.run(cmd, stdout=subprocess.DEVNULL, universal_newlines=True, check=True)
                 with tempfile.NamedTemporaryFile(mode="w+", dir=this_dir) as sf:
                     cmd = ["stack", "runghc", *STACK_OPTIONS, "--", f"-i={haskell_lib}", f.name, f"--stats={sf.name}"]
-                    try:
-                        subprocess.run(
-                            cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, universal_newlines=True, check=True
-                        )
-                    except subprocess.CalledProcessError as e:
-                        if e.returncode == 1:
-                            pass
-                        else:
-                            raise Exception(e)
-                    results[test_file] = self._parse_test_results(csv.reader(sf))
+                    out = subprocess.run(
+                        cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, universal_newlines=True, check=False
+                    )
+                    r = self._parse_test_results(csv.reader(sf))
+                    if r:
+                        results[test_file] = r
+                    else:
+                        raise Exception(out.stderr)
         return results
 
     @Tester.run_decorator