Merge pull request #166 from OpenDevin/xw/attempt-fix-django-parsing

Fix newline outputs for django's log parser

swebench/harness/log_parsers.py

@@ -73,13 +73,19 @@ def parse_log_django(log: str) -> dict[str, str]:
     """
     test_status_map = {}
     lines = log.split("\n")
+
+    prev_test = None
     for line in lines:
         line = line.strip()
 
         # This isn't ideal but the test output spans multiple lines
         if "--version is equivalent to version" in line:
             test_status_map["--version is equivalent to version"] = TestStatus.PASSED.value
 
+        # Log it in case of error
+        if " ... " in line:
+            prev_test = line.split(" ... ")[0]
+
         pass_suffixes = (" ... ok", " ... OK", " ...  OK")
         for suffix in pass_suffixes:
             if line.endswith(suffix):
@@ -107,6 +113,12 @@ def parse_log_django(log: str) -> dict[str, str]:
             test = line.split()[1].strip()
             test_status_map[test] = TestStatus.ERROR.value
 
+        if line.lstrip().startswith("ok") and prev_test is not None:
+            # It means the test passed, but there's some additional output (including new lines)
+            # between "..." and "ok" message
+            test = prev_test
+            test_status_map[test] = TestStatus.PASSED.value
+
     # TODO: This is very brittle, we should do better
     # There's a bug in the django logger, such that sometimes a test output near the end gets
     # interrupted by a particular long multiline print statement.