From 4cc44f9a508ecd22f5326ecc9aec17eb1a99e71c Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 8 Dec 2016 08:05:36 -0600 Subject: [PATCH] Improve _cleanup method for testing harness --- tests/test_asymmetric_lattice/inputs_true.dat | 2 +- .../test_asymmetric_lattice.py | 6 ---- .../test_create_fission_neutrons.py | 12 ++----- tests/test_diff_tally/test_diff_tally.py | 5 --- .../test_energy_cutoff/test_energy_cutoff.py | 12 ++----- .../test_filter_energyfun.py | 5 --- tests/test_filter_mesh/test_filter_mesh.py | 7 +--- tests/test_mg_tallies/test_mg_tallies.py | 7 +--- .../test_mgxs_library_condense.py | 6 ---- .../test_mgxs_library_distribcell.py | 7 +--- .../test_mgxs_library_mesh.py | 7 +--- .../test_mgxs_library_no_nuclides.py | 8 +---- .../test_mgxs_library_nuclides.py | 8 +---- tests/test_tallies/test_tallies.py | 7 +--- .../test_tally_aggregation.py | 4 --- .../test_tally_arithmetic.py | 4 --- .../test_tally_slice_merge.py | 4 --- tests/testing_harness.py | 32 ++++++++----------- 18 files changed, 27 insertions(+), 116 deletions(-) diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat index 7e48dcf430..84b81964c6 100644 --- a/tests/test_asymmetric_lattice/inputs_true.dat +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -1 +1 @@ -6bcc9cca24d42995bdff9bf9aca5e852c2dbca5cfb42a12ac637def9cf5cac227654182fc9cf9e17d07cf2e9af11fea832e3ae0eb7001cc09856f73d219664f9 \ No newline at end of file +25bfa163360c4c48a9f51c4cde33c4fb9080e472e11b11ad6d01452d90bcb57d123b95bb4ba6b92178e0c678a38e7d8fc136430e9c105b2be8d7243b5561c641 \ No newline at end of file diff --git a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py index c7d76aab3f..45d392ad07 100644 --- a/tests/test_asymmetric_lattice/test_asymmetric_lattice.py +++ b/tests/test_asymmetric_lattice/test_asymmetric_lattice.py @@ -69,7 +69,6 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): source = openmc.Source(space=openmc.stats.Box([-32, -32, 0], [32, 32, 32])) source.space.only_fissionable = True self._input_set.settings.source = source - self._input_set.settings.output = {'summary': True} # Write input XML files self._input_set.export() @@ -107,11 +106,6 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(AsymmetricLatticeTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': harness = AsymmetricLatticeTestHarness('statepoint.10.h5', True) diff --git a/tests/test_create_fission_neutrons/test_create_fission_neutrons.py b/tests/test_create_fission_neutrons/test_create_fission_neutrons.py index 80da831cc0..4434502d67 100755 --- a/tests/test_create_fission_neutrons/test_create_fission_neutrons.py +++ b/tests/test_create_fission_neutrons/test_create_fission_neutrons.py @@ -62,18 +62,12 @@ class CreateFissionNeutronsTestHarness(PyAPITestHarness): # Write out tally data. outstr = '' t = sp.get_tally() - outstr += 'tally {0}:\n'.format(t.id) - outstr += 'sum = {0:12.6E}\n'.format(t.sum[0, 0, 0]) - outstr += 'sum_sq = {0:12.6E}\n'.format(t.sum_sq[0, 0, 0]) + outstr += 'tally {}:\n'.format(t.id) + outstr += 'sum = {:12.6E}\n'.format(t.sum[0, 0, 0]) + outstr += 'sum_sq = {:12.6E}\n'.format(t.sum_sq[0, 0, 0]) return outstr - def _cleanup(self): - super(CreateFissionNeutronsTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): - os.remove(f) - if __name__ == '__main__': harness = CreateFissionNeutronsTestHarness('statepoint.10.h5', True) diff --git a/tests/test_diff_tally/test_diff_tally.py b/tests/test_diff_tally/test_diff_tally.py index 36287a66ac..84aa181568 100644 --- a/tests/test_diff_tally/test_diff_tally.py +++ b/tests/test_diff_tally/test_diff_tally.py @@ -129,11 +129,6 @@ class DiffTallyTestHarness(PyAPITestHarness): 'std. dev.') return df.to_csv(None, columns=cols, index=False, float_format='%.7e') - def _cleanup(self): - super(DiffTallyTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': harness = DiffTallyTestHarness('statepoint.3.h5', True) diff --git a/tests/test_energy_cutoff/test_energy_cutoff.py b/tests/test_energy_cutoff/test_energy_cutoff.py index 1bcdd0ea33..064e5c4d32 100755 --- a/tests/test_energy_cutoff/test_energy_cutoff.py +++ b/tests/test_energy_cutoff/test_energy_cutoff.py @@ -66,18 +66,12 @@ class EnergyCutoffTestHarness(PyAPITestHarness): # Write out tally data. outstr = '' t = sp.get_tally() - outstr += 'tally {0}:\n'.format(t.id) - outstr += 'sum = {0:12.6E}\n'.format(t.sum[0, 0, 0]) - outstr += 'sum_sq = {0:12.6E}\n'.format(t.sum_sq[0, 0, 0]) + outstr += 'tally {}:\n'.format(t.id) + outstr += 'sum = {:12.6E}\n'.format(t.sum[0, 0, 0]) + outstr += 'sum_sq = {:12.6E}\n'.format(t.sum_sq[0, 0, 0]) return outstr - def _cleanup(self): - super(EnergyCutoffTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): - os.remove(f) - if __name__ == '__main__': harness = EnergyCutoffTestHarness('statepoint.10.h5', True) diff --git a/tests/test_filter_energyfun/test_filter_energyfun.py b/tests/test_filter_energyfun/test_filter_energyfun.py index b7fa68fa4d..fd36e320c4 100644 --- a/tests/test_filter_energyfun/test_filter_energyfun.py +++ b/tests/test_filter_energyfun/test_filter_energyfun.py @@ -53,11 +53,6 @@ class FilterEnergyFunHarness(PyAPITestHarness): # Output the tally in a Pandas DataFrame. return br_tally.get_pandas_dataframe().to_string() + '\n' - def _cleanup(self): - super(FilterEnergyFunHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': harness = FilterEnergyFunHarness('statepoint.10.h5', True) diff --git a/tests/test_filter_mesh/test_filter_mesh.py b/tests/test_filter_mesh/test_filter_mesh.py index cb4beb2f80..a37f5cfe5b 100644 --- a/tests/test_filter_mesh/test_filter_mesh.py +++ b/tests/test_filter_mesh/test_filter_mesh.py @@ -77,12 +77,7 @@ class FilterMeshTestHarness(HashedPyAPITestHarness): self._input_set.tallies = tallies_file super(FilterMeshTestHarness, self)._build_inputs() - def _cleanup(self): - super(FilterMeshTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': - harness = FilterMeshTestHarness('statepoint.10.*', True) + harness = FilterMeshTestHarness('statepoint.10.h5', True) harness.main() diff --git a/tests/test_mg_tallies/test_mg_tallies.py b/tests/test_mg_tallies/test_mg_tallies.py index 305b53808e..257accb603 100644 --- a/tests/test_mg_tallies/test_mg_tallies.py +++ b/tests/test_mg_tallies/test_mg_tallies.py @@ -82,12 +82,7 @@ class MGTalliesTestHarness(HashedPyAPITestHarness): self._input_set.export() - def _cleanup(self): - super(MGTalliesTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': - harness = MGTalliesTestHarness('statepoint.10.*', True, mg=True) + harness = MGTalliesTestHarness('statepoint.10.h5', True, mg=True) harness.main() diff --git a/tests/test_mgxs_library_condense/test_mgxs_library_condense.py b/tests/test_mgxs_library_condense/test_mgxs_library_condense.py index 0adedac1c6..087e7a07b5 100644 --- a/tests/test_mgxs_library_condense/test_mgxs_library_condense.py +++ b/tests/test_mgxs_library_condense/test_mgxs_library_condense.py @@ -71,12 +71,6 @@ class MGXSTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(MGXSTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - - if __name__ == '__main__': harness = MGXSTestHarness('statepoint.10.*', True) harness.main() diff --git a/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py b/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py index cb64d9d76a..277e8583e3 100644 --- a/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py +++ b/tests/test_mgxs_library_distribcell/test_mgxs_library_distribcell.py @@ -72,12 +72,7 @@ class MGXSTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(MGXSTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': - harness = MGXSTestHarness('statepoint.10.*', True) + harness = MGXSTestHarness('statepoint.10.h5', True) harness.main() diff --git a/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py b/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py index f3f62d7f1e..7f67afd659 100644 --- a/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py +++ b/tests/test_mgxs_library_mesh/test_mgxs_library_mesh.py @@ -72,12 +72,7 @@ class MGXSTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(MGXSTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': - harness = MGXSTestHarness('statepoint.10.*', True) + harness = MGXSTestHarness('statepoint.10.h5', True) harness.main() diff --git a/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py b/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py index a5f6d2ccb0..aaad7d32b2 100644 --- a/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py +++ b/tests/test_mgxs_library_no_nuclides/test_mgxs_library_no_nuclides.py @@ -67,12 +67,6 @@ class MGXSTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(MGXSTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - - if __name__ == '__main__': - harness = MGXSTestHarness('statepoint.10.*', True) + harness = MGXSTestHarness('statepoint.10.h5', True) harness.main() diff --git a/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py b/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py index b23a722b2d..83d0ba05e4 100644 --- a/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py +++ b/tests/test_mgxs_library_nuclides/test_mgxs_library_nuclides.py @@ -64,12 +64,6 @@ class MGXSTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(MGXSTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - - if __name__ == '__main__': - harness = MGXSTestHarness('statepoint.10.*', True) + harness = MGXSTestHarness('statepoint.10.h5', True) harness.main() diff --git a/tests/test_tallies/test_tallies.py b/tests/test_tallies/test_tallies.py index 55c9dfa016..2efea5d3a6 100644 --- a/tests/test_tallies/test_tallies.py +++ b/tests/test_tallies/test_tallies.py @@ -177,12 +177,7 @@ class TalliesTestHarness(PyAPITestHarness): def _get_results(self): return super(TalliesTestHarness, self)._get_results(hash_output=True) - def _cleanup(self): - super(TalliesTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) - if __name__ == '__main__': - harness = TalliesTestHarness('statepoint.5.*', True) + harness = TalliesTestHarness('statepoint.5.h5', True) harness.main() diff --git a/tests/test_tally_aggregation/test_tally_aggregation.py b/tests/test_tally_aggregation/test_tally_aggregation.py index 6a6ee5e6be..012c2fb73e 100644 --- a/tests/test_tally_aggregation/test_tally_aggregation.py +++ b/tests/test_tally_aggregation/test_tally_aggregation.py @@ -76,10 +76,6 @@ class TallyAggregationTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(TallyAggregationTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) if __name__ == '__main__': harness = TallyAggregationTestHarness('statepoint.10.h5', True) diff --git a/tests/test_tally_arithmetic/test_tally_arithmetic.py b/tests/test_tally_arithmetic/test_tally_arithmetic.py index d28db3e959..6f2d2a248a 100644 --- a/tests/test_tally_arithmetic/test_tally_arithmetic.py +++ b/tests/test_tally_arithmetic/test_tally_arithmetic.py @@ -93,10 +93,6 @@ class TallyArithmeticTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(TallyArithmeticTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) if __name__ == '__main__': harness = TallyArithmeticTestHarness('statepoint.10.h5', True) diff --git a/tests/test_tally_slice_merge/test_tally_slice_merge.py b/tests/test_tally_slice_merge/test_tally_slice_merge.py index 7bb77fbb06..27b7046c51 100644 --- a/tests/test_tally_slice_merge/test_tally_slice_merge.py +++ b/tests/test_tally_slice_merge/test_tally_slice_merge.py @@ -176,10 +176,6 @@ class TallySliceMergeTestHarness(PyAPITestHarness): return outstr - def _cleanup(self): - super(TallySliceMergeTestHarness, self)._cleanup() - f = os.path.join(os.getcwd(), 'tallies.xml') - if os.path.exists(f): os.remove(f) if __name__ == '__main__': harness = TallySliceMergeTestHarness('statepoint.10.h5', True) diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 150d124c8c..82893c4f89 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -73,19 +73,19 @@ class TestHarness(object): def _test_output_created(self): """Make sure statepoint.* and tallies.out have been created.""" - statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name)) + statepoint = glob.glob(self._sp_name) assert len(statepoint) == 1, 'Either multiple or no statepoint files' \ ' exist.' assert statepoint[0].endswith('h5'), \ 'Statepoint file is not a HDF5 file.' if self._tallies: - assert os.path.exists(os.path.join(os.getcwd(), 'tallies.out')), \ + assert os.path.exists('tallies.out'), \ 'Tally output file does not exist.' def _get_results(self, hash_output=False): """Digest info in the statepoint and return as a string.""" # Read the statepoint file. - statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name))[0] + statepoint = glob.glob(self._sp_name)[0] sp = openmc.StatePoint(statepoint) # Write out k-combined. @@ -133,11 +133,9 @@ class TestHarness(object): def _cleanup(self): """Delete statepoints, tally, and test files.""" - output = glob.glob(os.path.join(os.getcwd(), 'statepoint.*.h5')) - output.append(os.path.join(os.getcwd(), 'tallies.out')) - output.append(os.path.join(os.getcwd(), 'results_test.dat')) - output.append(os.path.join(os.getcwd(), 'summary.h5')) - output += glob.glob(os.path.join(os.getcwd(), 'volume_*.h5')) + output = glob.glob('statepoint.*.h5') + output += ['tallies.out', 'results_test.dat', 'summary.h5'] + output += glob.glob('volume_*.h5') for f in output: if os.path.exists(f): os.remove(f) @@ -157,7 +155,7 @@ class CMFDTestHarness(TestHarness): def _get_results(self): """Digest info in the statepoint and return as a string.""" # Read the statepoint file. - statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name))[0] + statepoint = glob.glob(self._sp_name)[0] sp = openmc.StatePoint(statepoint) # Write out the eigenvalue and tallies. @@ -206,7 +204,7 @@ class ParticleRestartTestHarness(TestHarness): def _test_output_created(self): """Make sure the restart file has been created.""" - particle = glob.glob(os.path.join(os.getcwd(), self._sp_name)) + particle = glob.glob(self._sp_name) assert len(particle) == 1, 'Either multiple or no particle restart ' \ 'files exist.' assert particle[0].endswith('h5'), \ @@ -215,7 +213,7 @@ class ParticleRestartTestHarness(TestHarness): def _get_results(self): """Digest info in the statepoint and return as a string.""" # Read the particle restart file. - particle = glob.glob(os.path.join(os.getcwd(), self._sp_name))[0] + particle = glob.glob(self._sp_name)[0] p = openmc.Particle(particle) # Write out the properties. @@ -301,9 +299,8 @@ class PyAPITestHarness(TestHarness): def _get_inputs(self): """Return a hash digest of the input XML files.""" - xmls = ('geometry.xml', 'tallies.xml', 'materials.xml', 'settings.xml', - 'plots.xml') - xmls = [os.path.join(os.getcwd(), fname) for fname in xmls] + xmls = ['geometry.xml', 'tallies.xml', 'materials.xml', 'settings.xml', + 'plots.xml'] outstr = '\n'.join([open(fname).read() for fname in xmls if os.path.exists(fname)]) @@ -336,11 +333,8 @@ class PyAPITestHarness(TestHarness): def _cleanup(self): """Delete XMLs, statepoints, tally, and test files.""" super(PyAPITestHarness, self)._cleanup() - output = [os.path.join(os.getcwd(), 'materials.xml')] - output.append(os.path.join(os.getcwd(), 'geometry.xml')) - output.append(os.path.join(os.getcwd(), 'settings.xml')) - output.append(os.path.join(os.getcwd(), 'inputs_test.dat')) - output.append(os.path.join(os.getcwd(), 'summary.h5')) + output = ['materials.xml', 'geometry.xml', 'settings.xml', + 'tallies.xml', 'inputs_test.dat'] for f in output: if os.path.exists(f): os.remove(f)