Fix parallel test in case they are completed out of order

NREL · May 11, 2021 · b5fbac1 · b5fbac1
1 parent 97772d9
commit b5fbac1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/epregressions/diffs/ci_compare_script.py b/epregressions/diffs/ci_compare_script.py
@@ -71,7 +71,7 @@ def main_function(file_name, base_dir, mod_dir, base_sha, mod_sha, make_public,
     runner = SuiteRunner(run_config, [])
 
     cleanup(mod_dir)
-    entry = runner.process_diffs_for_one_case(
+    entry, message = runner.process_diffs_for_one_case(
         initial_entry,
         runner.build_tree_a,
         runner.build_tree_b,

diff --git a/epregressions/tests/test_runtests.py b/epregressions/tests/test_runtests.py
@@ -1004,7 +1004,10 @@ def test_base_case_but_multi_process(self):
         diff_results = r.run_test_suite()
         # there should be 1 file result
         self.assertEqual(2, len(diff_results.entries_by_file))
-        results_for_file = diff_results.entries_by_file[0]
+        if diff_results.entries_by_file[0].basename == 'my_file':
+            results_for_file = diff_results.entries_by_file[0]
+        elif diff_results.entries_by_file[1].basename == 'my_file':
+            results_for_file = diff_results.entries_by_file[1]
         # it should be named according to what we listed above
         self.assertEqual('my_file', results_for_file.basename)
         # it should have succeeded in both base and mod cases