crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 06:05:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Added update capability to TestHarness #402

Browse source
This commit is contained in:
Sterling Harper 2015-06-29 18:50:53 -06:00
parent 206341d0dd
commit 62d4670d1b
95 changed files with 174 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_basic/test_basic.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_cmfd_feed/test_cmfd_feed.py
View file

@ -7,4 +7,4 @@ from testing_harness import CMFDTestHarness
if __name__ == '__main__':
harness = CMFDTestHarness('statepoint.20.*', True)
harness.execute_test()
harness.main()

2
tests/test_cmfd_nofeed/test_cmfd_nofeed.py
View file

@ -7,4 +7,4 @@ from testing_harness import CMFDTestHarness
if __name__ == '__main__':
harness = CMFDTestHarness('statepoint.20.*', True)
harness.execute_test()
harness.main()

2
tests/test_confidence_intervals/test_confidence_intervals.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_density_atombcm/test_density_atombcm.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_density_atomcm3/test_density_atomcm3.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_density_kgm3/test_density_kgm3.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_density_sum/test_density_sum.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.7.*')
harness.execute_test()
harness.main()

2
tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_energy_grid/test_energy_grid.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_entropy/test_entropy.py
View file

@ -28,4 +28,4 @@ class EntropyTestHarness(TestHarness):
if __name__ == '__main__':
harness = EntropyTestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_filter_cell/test_filter_cell.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_cellborn/test_filter_cellborn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

27
tests/test_filter_distribcell/test_filter_distribcell.py
View file

@ -15,7 +15,7 @@ class DistribcellTestHarness(TestHarness):
self._args = None
def execute_test(self):
self._parse_args()
"""Run OpenMC with the appropriate arguments and check the outputs."""
base_dir = os.getcwd()
try:
dirs = ('case-1', '../case-2', '../case-3')
@ -37,6 +37,29 @@ class DistribcellTestHarness(TestHarness):
os.chdir(dirs[i])
self._cleanup()
def update_results(self):
"""Update the results_true using the current version of OpenMC."""
base_dir = os.getcwd()
try:
dirs = ('case-1', '../case-2', '../case-3')
sps = ('statepoint.1.*', 'statepoint.1.*', 'statepoint.3.*')
tallies_out_present = (True, True, False)
hash_out = (False, False, True)
for i in range(len(dirs)):
os.chdir(dirs[i])
self._sp_name = sps[i]
self._run_openmc()
self._test_output_created(tallies_out_present[i])
results = self._get_results(hash_out[i])
self._write_results(results)
self._overwrite_results()
finally:
os.chdir(base_dir)
for i in range(len(dirs)):
os.chdir(dirs[i])
self._cleanup()
def _test_output_created(self, tallies_out_present):
"""Make sure statepoint.* and tallies.out have been created."""
statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name))
@ -52,4 +75,4 @@ class DistribcellTestHarness(TestHarness):
if __name__ == '__main__':
harness = DistribcellTestHarness()
harness.execute_test()
harness.main()

2
tests/test_filter_energy/test_filter_energy.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_energyout/test_filter_energyout.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_group_transfer/test_filter_group_transfer.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_material/test_filter_material.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_mesh_2d/test_filter_mesh_2d.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_mesh_3d/test_filter_mesh_3d.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_filter_universe/test_filter_universe.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_fixed_source/test_fixed_source.py
View file

@ -33,4 +33,4 @@ class FixedSourceTestHarness(TestHarness):
if __name__ == '__main__':
harness = FixedSourceTestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_infinite_cell/test_infinite_cell.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_lattice/test_lattice.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_lattice_hex/test_lattice_hex.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_lattice_mixed/test_lattice_mixed.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_lattice_multiple/test_lattice_multiple.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_many_scores/test_many_scores.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.5.*', True)
harness.execute_test()
harness.main()

2
tests/test_natural_element/test_natural_element.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_output/test_output.py
View file

@ -32,4 +32,4 @@ class OutputTestHarness(TestHarness):
if __name__ == '__main__':
harness = OutputTestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_particle_restart_eigval/test_particle_restart_eigval.py
View file

@ -7,4 +7,4 @@ from testing_harness import ParticleRestartTestHarness
if __name__ == '__main__':
harness = ParticleRestartTestHarness('particle_12_616.*')
harness.execute_test()
harness.main()

2
tests/test_particle_restart_fixed/test_particle_restart_fixed.py
View file

@ -7,4 +7,4 @@ from testing_harness import ParticleRestartTestHarness
if __name__ == '__main__':
harness = ParticleRestartTestHarness('particle_7_6144.*')
harness.execute_test()
harness.main()

2
tests/test_plot_background/test_plot_background.py
View file

@ -7,4 +7,4 @@ from testing_harness import PlotTestHarness
if __name__ == '__main__':
harness = PlotTestHarness(('1_plot.ppm', ))
harness.execute_test()
harness.main()

2
tests/test_plot_basis/test_plot_basis.py
View file

@ -7,4 +7,4 @@ from testing_harness import PlotTestHarness
if __name__ == '__main__':
harness = PlotTestHarness(('1_plot.ppm', '2_plot.ppm', '3_plot.ppm'))
harness.execute_test()
harness.main()

2
tests/test_plot_colspec/test_plot_colspec.py
View file

@ -7,4 +7,4 @@ from testing_harness import PlotTestHarness
if __name__ == '__main__':
harness = PlotTestHarness(('1_plot.ppm', ))
harness.execute_test()
harness.main()

2
tests/test_plot_mask/test_plot_mask.py
View file

@ -7,4 +7,4 @@ from testing_harness import PlotTestHarness
if __name__ == '__main__':
harness = PlotTestHarness(('1_plot.ppm', '2_plot.ppm', '3_plot.ppm'))
harness.execute_test()
harness.main()

2
tests/test_ptables_off/test_ptables_off.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_reflective_cone/test_reflective_cone.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_reflective_cylinder/test_reflective_cylinder.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_reflective_plane/test_reflective_plane.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_reflective_sphere/test_reflective_sphere.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_resonance_scattering/test_resonance_scattering.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_rotation/test_rotation.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_salphabeta/test_salphabeta.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_salphabeta_multiple/test_salphabeta_multiple.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_score_MT/test_score_MT.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_absorption/test_score_absorption.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_current/test_score_current.py
View file

@ -7,4 +7,4 @@ from testing_harness import HashedTestHarness
if __name__ == '__main__':
harness = HashedTestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_events/test_score_events.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_fission/test_score_fission.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_flux/test_score_flux.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_flux_yn/test_score_flux_yn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_kappafission/test_score_kappafission.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_nufission/test_score_nufission.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_nuscatter/test_score_nuscatter.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_nuscatter_n/test_score_nuscatter_n.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_scatter/test_score_scatter.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_scatter_n/test_score_scatter_n.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_scatter_pn/test_score_scatter_pn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_scatter_yn/test_score_scatter_yn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_total/test_score_total.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_score_total_yn/test_score_total_yn.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_seed/test_seed.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_source_angle_mono/test_source_angle_mono.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_source_energy_maxwell/test_source_energy_maxwell.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_source_energy_mono/test_source_energy_mono.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

16
tests/test_source_file/test_source_file.py
View file

@ -38,7 +38,7 @@ settings2 = """<?xml version="1.0"?>
class SourceFileTestHarness(TestHarness):
def execute_test(self):
self._parse_args()
"""Run OpenMC with the appropriate arguments and check the outputs."""
try:
self._run_openmc()
self._test_output_created()
@ -49,6 +49,18 @@ class SourceFileTestHarness(TestHarness):
finally:
self._cleanup()
def update_results(self):
"""Update the results_true using the current version of OpenMC."""
try:
self._run_openmc()
self._test_output_created()
self._run_openmc_restart()
results = self._get_results()
self._write_results(results)
self._overwrite_results()
finally:
self._cleanup()
def _test_output_created(self):
"""Make sure statepoint and source files have been created."""
statepoint = glob.glob(os.path.join(os.getcwd(), self._sp_name))
@ -95,4 +107,4 @@ class SourceFileTestHarness(TestHarness):
if __name__ == '__main__':
harness = SourceFileTestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_source_point/test_source_point.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_sourcepoint_batch/test_sourcepoint_batch.py
View file

@ -35,4 +35,4 @@ class SourcepointTestHarness(TestHarness):
if __name__ == '__main__':
harness = SourcepointTestHarness('statepoint.08.*')
harness.execute_test()
harness.main()

2
tests/test_sourcepoint_interval/test_sourcepoint_interval.py
View file

@ -35,4 +35,4 @@ class SourcepointTestHarness(TestHarness):
if __name__ == '__main__':
harness = SourcepointTestHarness('statepoint.08.*')
harness.execute_test()
harness.main()

2
tests/test_sourcepoint_latest/test_sourcepoint_latest.py
View file

@ -19,4 +19,4 @@ class SourcepointTestHarness(TestHarness):
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_sourcepoint_restart/test_sourcepoint_restart.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_statepoint_batch/test_statepoint_batch.py
View file

@ -21,4 +21,4 @@ class StatepointTestHarness(TestHarness):
if __name__ == '__main__':
harness = StatepointTestHarness()
harness.execute_test()
harness.main()

2
tests/test_statepoint_interval/test_statepoint_interval.py
View file

@ -23,4 +23,4 @@ class StatepointTestHarness(TestHarness):
if __name__ == '__main__':
harness = StatepointTestHarness()
harness.execute_test()
harness.main()

15
tests/test_statepoint_restart/test_statepoint_restart.py
View file

@ -7,7 +7,7 @@ from testing_harness import *
class StatepointRestartTestHarness(TestHarness):
def execute_test(self):
self._parse_args()
"""Run OpenMC with the appropriate arguments and check the outputs."""
try:
self._run_openmc()
self._test_output_created()
@ -23,6 +23,17 @@ class StatepointRestartTestHarness(TestHarness):
finally:
self._cleanup()
def update_results(self):
"""Update the results_true using the current version of OpenMC."""
try:
self._run_openmc()
self._test_output_created()
results = self._get_results()
self._write_results(results)
self._overwrite_results()
finally:
self._cleanup()
def _run_openmc_restart(self):
# Get the number of MPI processes.
if self._opts.mpi_exec:
@ -42,4 +53,4 @@ class StatepointRestartTestHarness(TestHarness):
if __name__ == '__main__':
harness = StatepointRestartTestHarness('statepoint.07.*', True)
harness.execute_test()
harness.main()

2
tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
View file

@ -19,4 +19,4 @@ class SourcepointTestHarness(TestHarness):
if __name__ == '__main__':
harness = SourcepointTestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_survival_biasing/test_survival_biasing.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_tally_assumesep/test_tally_assumesep.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_tally_nuclides/test_tally_nuclides.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_trace/test_trace.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_track_output/test_track_output.py
View file

@ -53,4 +53,4 @@ if __name__ == '__main__':
shutil.copy('results_true.dat', 'results_test.dat')
exit()
harness = TrackTestHarness('statepoint.2.*')
harness.execute_test()
harness.main()

2
tests/test_translation/test_translation.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_trigger_batch_interval/test_trigger_batch_interval.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.19.*', True)
harness.execute_test()
harness.main()

2
tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.19.*', True)
harness.execute_test()
harness.main()

2
tests/test_trigger_no_status/test_trigger_no_status.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*', True)
harness.execute_test()
harness.main()

2
tests/test_trigger_tallies/test_trigger_tallies.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.15.*', True)
harness.execute_test()
harness.main()

2
tests/test_uniform_fs/test_uniform_fs.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_union_energy_grids/test_union_energy_grids.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_universe/test_universe.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

2
tests/test_void/test_void.py
View file

@ -7,4 +7,4 @@ from testing_harness import TestHarness
if __name__ == '__main__':
harness = TestHarness('statepoint.10.*')
harness.execute_test()
harness.main()

27
tests/testing_harness.py
View file

@ -5,6 +5,7 @@ import glob
import hashlib
from optparse import OptionParser
import os
import shutil
from subprocess import Popen, STDOUT, PIPE, call
import sys
@ -24,9 +25,16 @@ class TestHarness(object):
self._opts = None
self._args = None
def main(self):
"""Accept commandline arguments and either run or update tests."""
self._parse_args()
if self._opts.update:
self.update_results()
else:
self.execute_test()
def execute_test(self):
"""Run OpenMC with the appropriate arguments and check the outputs."""
self._parse_args()
try:
self._run_openmc()
self._test_output_created()
@ -36,11 +44,24 @@ class TestHarness(object):
finally:
self._cleanup()
def update_results(self):
"""Update the results_true using the current version of OpenMC."""
try:
self._run_openmc()
self._test_output_created()
results = self._get_results()
self._write_results(results)
self._overwrite_results()
finally:
self._cleanup()
def _parse_args(self):
parser = OptionParser()
parser.add_option('--mpi_exec', dest='mpi_exec', action='store_true',
default=False)
parser.add_option('--mpi_np', dest='mpi_np', type=int, default=3)
parser.add_option('--update', dest='update', action='store_true',
default=False)
(self._opts, self._args) = parser.parse_args()
def _run_openmc(self):
@ -104,6 +125,10 @@ class TestHarness(object):
with open('results_test.dat','w') as fh:
fh.write(results_string)
def _overwrite_results(self):
"""Overwrite the results_true with the results_test."""
shutil.copyfile('results_test.dat', 'results_true.dat')
def _compare_results(self):
compare = filecmp.cmp('results_test.dat', 'results_true.dat')
if not compare:

54
tests/update_results.py
View file

@ -9,9 +9,6 @@ from glob import glob
from optparse import OptionParser
parser = OptionParser()
parser.add_option('--exe', dest='exe',
help="Path to openmc executable with basic \
configuration options (no HDF5, no MPI, etc.)")
parser.add_option('-R', '--tests-regex', dest='regex_tests',
help="Run tests matching regular expression. \
Test names are the directories present in tests folder.\
@ -25,12 +22,6 @@ FAIL = '\033[91m'
ENDC = '\033[0m'
BOLD = '\033[1m'
# Check for valid executable
if opts.exe is None:
raise Exception('Need to specify an OpenMC executable')
else:
openmc_exe = os.path.abspath(opts.exe)
# Get a list of all test folders
folders = glob('test_*')
@ -41,10 +32,6 @@ if opts.regex_tests is not None:
# Loop around directories
for adir in sorted(folders):
# Skip test compile or plot
if adir.find('plot') != -1:
continue
# Go into that directory
os.chdir(adir)
pwd = os.path.abspath(os.path.dirname('settings.xml'))
@ -56,47 +43,18 @@ for adir in sorted(folders):
for i in range(35 - sz):
print('.', end="")
# Handle source file test separately since it requires running OpenMC twice
if adir == 'test_source_file':
if os.path.exists('results_error.dat'):
os.remove('results_error.dat')
proc = Popen(['python', 'test_source_file.py', '--exe', openmc_exe],
stderr=STDOUT, stdout=PIPE)
returncode = proc.wait()
if os.path.exists('results_error.dat'):
os.rename('results_error.dat', 'results_true.dat')
print(BOLD + OKGREEN + "[OK]" + ENDC)
os.chdir('..')
continue
# Find the test executable
test_exec = glob('test_*.py')
assert len(test_exec) == 1, 'There must be only one test executable per ' \
'test directory'
# Handle distribcell test separately since it requires running OpenMC 3x
elif adir == 'test_filter_distribcell':
if os.path.exists('results_error.dat'):
os.remove('results_error.dat')
proc = Popen(['python', 'test_filter_distribcell.py',
'--exe', openmc_exe], stderr=STDOUT, stdout=PIPE)
returncode = proc.wait()
if os.path.exists('results_error.dat'):
print('renamed results_error!!!')
os.rename('results_error.dat', 'results_true.dat')
print(BOLD + OKGREEN + "[OK]" + ENDC)
os.chdir('..')
continue
# Run openmc
proc = Popen([openmc_exe], stderr=STDOUT, stdout=PIPE)
# Update the test results
proc = Popen(['python', test_exec[0], '--update'])
returncode = proc.wait()
if returncode == 0:
print(BOLD + OKGREEN + "[OK]" + ENDC)
else:
print(BOLD + FAIL + "[FAILED]" + ENDC)
# Process results
if returncode == 0:
call(['python', 'results.py'])
os.rename('results_test.dat', 'results_true.dat')
for path in glob("*.binary") + glob("*.out"):
os.remove(path)
# Go back a directory
os.chdir('..')