From 4c96fc11d0e69601468afd7fb5f9ba1d0d188657 Mon Sep 17 00:00:00 2001 From: alex-lyons Date: Mon, 17 Feb 2020 16:13:11 +0000 Subject: [PATCH] ensure results are loaded from the last statepoint for testing --- .../results_true.dat | 6 ++--- .../trigger_statepoint_restart/test.py | 24 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tests/regression_tests/trigger_statepoint_restart/results_true.dat b/tests/regression_tests/trigger_statepoint_restart/results_true.dat index 84363f8696..dc5ed98310 100644 --- a/tests/regression_tests/trigger_statepoint_restart/results_true.dat +++ b/tests/regression_tests/trigger_statepoint_restart/results_true.dat @@ -1,5 +1,5 @@ k-combined: -2.909598E-01 6.161987E-03 +3.040704E-01 1.976825E-03 tally 1: -3.852896E+01 -2.976246E+02 +3.389935E+02 +2.743454E+03 diff --git a/tests/regression_tests/trigger_statepoint_restart/test.py b/tests/regression_tests/trigger_statepoint_restart/test.py index 66416297b1..961a576a55 100644 --- a/tests/regression_tests/trigger_statepoint_restart/test.py +++ b/tests/regression_tests/trigger_statepoint_restart/test.py @@ -56,20 +56,24 @@ class TriggerStatepointRestartTestHarness(PyAPITestHarness): super().__init__(statepoint, model) self._restart_sp = None self._final_sp = None + # store the statepoint filename pattern separately to sp_name so we can reuse it + self._sp_pattern = self._sp_name def _test_output_created(self): """Make sure statepoint files have been created.""" - spfiles = glob.glob(self._sp_name) + spfiles = glob.glob(self._sp_pattern) assert len(spfiles) == 2, \ 'Two statepoint files should have been created' - if self._final_sp: - # Second restart run - assert spfiles[1] == self._final_sp, \ - 'Final statepoint names were different' - else: + if not self._final_sp: # First non-restart run self._restart_sp = spfiles[0] self._final_sp = spfiles[1] + else: + # Second restart run + assert spfiles[1] == self._final_sp, \ + 'Final statepoint names were different' + # Use the final_sp as the sp_name for the 'standard' results tests + self._sp_name = self._final_sp def execute_test(self): """ @@ -101,15 +105,15 @@ class TriggerStatepointRestartTestHarness(PyAPITestHarness): with openmc.StatePoint(self._model.statepoint) as sp: sp_batchno_2 = sp.current_batch assert sp_batchno_2 > 10 + assert sp_batchno_1 == sp_batchno_2, \ + 'Different final batch number after restart' + assert str(k_combined_1) == str(k_combined_2), \ + 'Different final k_combined after restart' self._write_inputs(self._get_inputs()) self._compare_inputs() self._test_output_created() self._write_results(self._get_results()) self._compare_results() - assert str(k_combined_1) == str(k_combined_2), \ - 'Different final k_combined after restart' - assert sp_batchno_1 == sp_batchno_2, \ - 'Different final batch number after restart' finally: self._cleanup()