Skip to content

Commit

Permalink
Merge pull request #313 from ESMCI/jgfouca/correctly_report_problem_i…
Browse files Browse the repository at this point in the history
…n_test

On batch systems, be sure to report that the problem is with wait_for…
  • Loading branch information
jedwards4b authored Aug 1, 2016
2 parents 98a0380 + 9a46a99 commit c269ab9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion utils/python/tests/scripts_regression_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,8 @@ def simple_test(self, expect_works, extra_args):
if (self._hasbatch):
self.assertEqual(stat, 0, msg="COMMAND '%s' SHOULD HAVE WORKED\ncreate_test output:\n%s\n\nerrput:\n%s\n\ncode: %d" % (cmd, output, errput, stat))
test_id = extra_args.split()[extra_args.split().index("-t") + 1]
stat, output, errput = run_cmd("%s/wait_for_tests *%s*/TestStatus" % (TOOLS_DIR, test_id), from_dir=self._testroot)
cmd = "%s/wait_for_tests *%s*/TestStatus" % (TOOLS_DIR, test_id)
stat, output, errput = run_cmd(cmd, from_dir=self._testroot)

if (expect_works):
self.assertEqual(stat, 0, msg="COMMAND '%s' SHOULD HAVE WORKED\nOutput:\n%s\n\nerrput:\n%s\n\ncode: %d" % (cmd, output, errput, stat))
Expand Down

0 comments on commit c269ab9

Please sign in to comment.