Skip to content

Commit

Permalink
Merge branch 'jgfouca/scripts_acme/minor_bless_fix'
Browse files Browse the repository at this point in the history
[BFB]

* jgfouca/scripts_acme/minor_bless_fix:
  bless_test_results: Minor fix
  • Loading branch information
jgfouca committed Oct 26, 2015
2 parents 09ef626 + 4b7c739 commit 368a5c5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cime/scripts-acme/bless_test_results
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ def bless_test_results(baseline_name, test_root, compiler, namelists_only=False,
warning("Test '%s' did not run successfully, it is not safe to bless results" % test_name)
time.sleep(2)
else:
expect(create_test_impl.HIST_COMPARE_PHASE in test_result,
expect(wait_for_tests.HIST_COMPARE_PHASE in test_result,
"Test '%s' had no history compare phase" % test_name)
hist_pass = test_result[create_test_impl.HIST_COMPARE_PHASE] == wait_for_tests.TEST_PASSED_STATUS
hist_pass = test_result[wait_for_tests.HIST_COMPARE_PHASE] == wait_for_tests.TEST_PASSED_STATUS

if ( (nl_pass and hist_pass) or (nl_pass and namelists_only) or (hist_pass and hist_only) ):
print "Nothing to bless for test:", test_name, " overall status:", overall_result
Expand Down

0 comments on commit 368a5c5

Please sign in to comment.