From 740f03fce15760433a90835c2197cb5bc42f5160 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 29 Jan 2018 12:10:24 -0600 Subject: [PATCH] Use single package-level fixture for regression tests --- .../asymmetric_lattice/test.py | 3 +- tests/regression_tests/cmfd_feed/test.py | 3 +- tests/regression_tests/cmfd_nofeed/test.py | 3 +- tests/regression_tests/complex_cell/test.py | 3 +- .../confidence_intervals/test.py | 3 +- tests/regression_tests/conftest.py | 15 ++++++++++ .../create_fission_neutrons/test.py | 3 +- tests/regression_tests/density/test.py | 3 +- tests/regression_tests/diff_tally/test.py | 3 +- tests/regression_tests/distribmat/test.py | 3 +- .../eigenvalue_genperbatch/test.py | 3 +- .../eigenvalue_no_inactive/test.py | 3 +- tests/regression_tests/energy_cutoff/test.py | 3 +- tests/regression_tests/energy_grid/test.py | 3 +- tests/regression_tests/energy_laws/test.py | 3 +- tests/regression_tests/entropy/test.py | 3 +- .../filter_distribcell/test.py | 3 +- .../regression_tests/filter_energyfun/test.py | 3 +- tests/regression_tests/filter_mesh/test.py | 3 +- tests/regression_tests/fixed_source/test.py | 3 +- tests/regression_tests/infinite_cell/test.py | 3 +- tests/regression_tests/iso_in_lab/test.py | 3 +- tests/regression_tests/lattice/test.py | 3 +- tests/regression_tests/lattice_hex/test.py | 3 +- tests/regression_tests/lattice_mixed/test.py | 3 +- .../regression_tests/lattice_multiple/test.py | 3 +- tests/regression_tests/mg_basic/test.py | 3 +- tests/regression_tests/mg_convert/test.py | 3 +- tests/regression_tests/mg_legendre/test.py | 3 +- tests/regression_tests/mg_max_order/test.py | 3 +- tests/regression_tests/mg_nuclide/test.py | 3 +- .../mg_survival_biasing/test.py | 3 +- tests/regression_tests/mg_tallies/test.py | 3 +- .../mgxs_library_ce_to_mg/test.py | 3 +- .../mgxs_library_condense/test.py | 3 +- .../mgxs_library_distribcell/test.py | 3 +- .../mgxs_library_hdf5/test.py | 3 +- .../mgxs_library_mesh/test.py | 3 +- .../mgxs_library_no_nuclides/test.py | 3 +- .../mgxs_library_nuclides/test.py | 3 +- tests/regression_tests/multipole/test.py | 3 +- tests/regression_tests/output/test.py | 3 +- .../particle_restart_eigval/test.py | 3 +- .../particle_restart_fixed/test.py | 3 +- tests/regression_tests/periodic/test.py | 3 +- tests/regression_tests/plot/test.py | 3 +- tests/regression_tests/ptables_off/test.py | 3 +- .../regression_tests/quadric_surfaces/test.py | 3 +- .../regression_tests/reflective_plane/test.py | 3 +- .../resonance_scattering/test.py | 3 +- tests/regression_tests/rotation/test.py | 3 +- tests/regression_tests/salphabeta/test.py | 3 +- tests/regression_tests/score_current/test.py | 3 +- tests/regression_tests/seed/test.py | 3 +- tests/regression_tests/source/test.py | 3 +- tests/regression_tests/source_file/test.py | 3 +- .../sourcepoint_batch/test.py | 3 +- .../sourcepoint_latest/test.py | 3 +- .../sourcepoint_restart/test.py | 3 +- .../regression_tests/statepoint_batch/test.py | 3 +- .../statepoint_restart/test.py | 3 +- .../statepoint_sourcesep/test.py | 3 +- tests/regression_tests/surface_tally/test.py | 3 +- .../regression_tests/survival_biasing/test.py | 3 +- tests/regression_tests/tallies/test.py | 3 +- .../tally_aggregation/test.py | 3 +- .../regression_tests/tally_arithmetic/test.py | 3 +- .../regression_tests/tally_assumesep/test.py | 3 +- tests/regression_tests/tally_nuclides/test.py | 3 +- .../tally_slice_merge/test.py | 3 +- tests/regression_tests/trace/test.py | 3 +- tests/regression_tests/track_output/test.py | 3 +- tests/regression_tests/translation/test.py | 3 +- .../trigger_batch_interval/test.py | 3 +- .../trigger_no_batch_interval/test.py | 3 +- .../trigger_no_status/test.py | 3 +- .../regression_tests/trigger_tallies/test.py | 3 +- tests/regression_tests/triso/test.py | 3 +- tests/regression_tests/uniform_fs/test.py | 3 +- tests/regression_tests/universe/test.py | 3 +- tests/regression_tests/void/test.py | 3 +- tests/regression_tests/volume_calc/test.py | 3 +- tests/testing_harness.py | 29 +++++++------------ 83 files changed, 106 insertions(+), 181 deletions(-) create mode 100644 tests/regression_tests/conftest.py diff --git a/tests/regression_tests/asymmetric_lattice/test.py b/tests/regression_tests/asymmetric_lattice/test.py index 8bb2384855..0318d7b922 100644 --- a/tests/regression_tests/asymmetric_lattice/test.py +++ b/tests/regression_tests/asymmetric_lattice/test.py @@ -88,7 +88,6 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness): return outstr -def test_asymmetric_lattice(request): +def test_asymmetric_lattice(): harness = AsymmetricLatticeTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/cmfd_feed/test.py b/tests/regression_tests/cmfd_feed/test.py index 677c58c2a0..4fc39d96ad 100644 --- a/tests/regression_tests/cmfd_feed/test.py +++ b/tests/regression_tests/cmfd_feed/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import CMFDTestHarness -def test_cmfd_feed(request): +def test_cmfd_feed(): harness = CMFDTestHarness('statepoint.20.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/cmfd_nofeed/test.py b/tests/regression_tests/cmfd_nofeed/test.py index 113efc051d..a3c7301738 100644 --- a/tests/regression_tests/cmfd_nofeed/test.py +++ b/tests/regression_tests/cmfd_nofeed/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import CMFDTestHarness -def test_cmfd_nofeed(request): +def test_cmfd_nofeed(): harness = CMFDTestHarness('statepoint.20.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/complex_cell/test.py b/tests/regression_tests/complex_cell/test.py index 0e12eccf66..77cbd6cb7d 100755 --- a/tests/regression_tests/complex_cell/test.py +++ b/tests/regression_tests/complex_cell/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_complex_cell(request): +def test_complex_cell(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/confidence_intervals/test.py b/tests/regression_tests/confidence_intervals/test.py index 9d87e596be..3227418280 100755 --- a/tests/regression_tests/confidence_intervals/test.py +++ b/tests/regression_tests/confidence_intervals/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_confidence_intervals(request): +def test_confidence_intervals(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/conftest.py b/tests/regression_tests/conftest.py new file mode 100644 index 0000000000..00ef247dc4 --- /dev/null +++ b/tests/regression_tests/conftest.py @@ -0,0 +1,15 @@ +import openmc +import pytest + + +@pytest.fixture(scope='module', autouse=True) +def setup_regression_test(request): + # Reset autogenerated IDs assigned to OpenMC objects + openmc.reset_auto_ids() + + # Change to test directory + olddir = request.fspath.dirpath().chdir() + try: + yield + finally: + olddir.chdir() diff --git a/tests/regression_tests/create_fission_neutrons/test.py b/tests/regression_tests/create_fission_neutrons/test.py index 86ff9a29f9..f1c1d072cb 100755 --- a/tests/regression_tests/create_fission_neutrons/test.py +++ b/tests/regression_tests/create_fission_neutrons/test.py @@ -65,7 +65,6 @@ class CreateFissionNeutronsTestHarness(PyAPITestHarness): return outstr -def test_create_fission_neutrons(request): +def test_create_fission_neutrons(): harness = CreateFissionNeutronsTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/density/test.py b/tests/regression_tests/density/test.py index 8ce3f5898e..f3ae6b4144 100644 --- a/tests/regression_tests/density/test.py +++ b/tests/regression_tests/density/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_density(request): +def test_density(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/diff_tally/test.py b/tests/regression_tests/diff_tally/test.py index 87dcd77b8f..e383b726e8 100644 --- a/tests/regression_tests/diff_tally/test.py +++ b/tests/regression_tests/diff_tally/test.py @@ -122,7 +122,6 @@ class DiffTallyTestHarness(PyAPITestHarness): return df.to_csv(None, columns=cols, index=False, float_format='%.7e') -def test_diff_tally(request): +def test_diff_tally(): harness = DiffTallyTestHarness('statepoint.3.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/distribmat/test.py b/tests/regression_tests/distribmat/test.py index fdb77669ec..69bb7a67b1 100644 --- a/tests/regression_tests/distribmat/test.py +++ b/tests/regression_tests/distribmat/test.py @@ -99,7 +99,6 @@ class DistribmatTestHarness(PyAPITestHarness): return outstr -def test_distribmat(request): +def test_distribmat(): harness = DistribmatTestHarness('statepoint.5.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/eigenvalue_genperbatch/test.py b/tests/regression_tests/eigenvalue_genperbatch/test.py index 1ba8e0d637..0dfb112428 100644 --- a/tests/regression_tests/eigenvalue_genperbatch/test.py +++ b/tests/regression_tests/eigenvalue_genperbatch/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_eigenvalue_genperbatch(request): +def test_eigenvalue_genperbatch(): harness = TestHarness('statepoint.7.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/eigenvalue_no_inactive/test.py b/tests/regression_tests/eigenvalue_no_inactive/test.py index a7ed17e0d4..5ab4900153 100644 --- a/tests/regression_tests/eigenvalue_no_inactive/test.py +++ b/tests/regression_tests/eigenvalue_no_inactive/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_eigenvalue_no_inactive(request): +def test_eigenvalue_no_inactive(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/energy_cutoff/test.py b/tests/regression_tests/energy_cutoff/test.py index d597b331f2..8b16149947 100755 --- a/tests/regression_tests/energy_cutoff/test.py +++ b/tests/regression_tests/energy_cutoff/test.py @@ -69,7 +69,6 @@ class EnergyCutoffTestHarness(PyAPITestHarness): return outstr -def test_energy_cutoff(request): +def test_energy_cutoff(): harness = EnergyCutoffTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/energy_grid/test.py b/tests/regression_tests/energy_grid/test.py index f03e7de66a..889bdfbc61 100644 --- a/tests/regression_tests/energy_grid/test.py +++ b/tests/regression_tests/energy_grid/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_energy_grid(request): +def test_energy_grid(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/energy_laws/test.py b/tests/regression_tests/energy_laws/test.py index 02a58f763b..8f9bbde356 100644 --- a/tests/regression_tests/energy_laws/test.py +++ b/tests/regression_tests/energy_laws/test.py @@ -19,7 +19,6 @@ that use linear-linear interpolation. from tests.testing_harness import TestHarness -def test_energy_laws(request): +def test_energy_laws(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/entropy/test.py b/tests/regression_tests/entropy/test.py index c2ccceffed..0f1052b6b8 100644 --- a/tests/regression_tests/entropy/test.py +++ b/tests/regression_tests/entropy/test.py @@ -24,7 +24,6 @@ class EntropyTestHarness(TestHarness): return outstr -def test_entropy(request): +def test_entropy(): harness = EntropyTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/filter_distribcell/test.py b/tests/regression_tests/filter_distribcell/test.py index a1354f56f9..bdd134bf57 100644 --- a/tests/regression_tests/filter_distribcell/test.py +++ b/tests/regression_tests/filter_distribcell/test.py @@ -68,7 +68,6 @@ class DistribcellTestHarness(TestHarness): 'Tally output file does not exist.' -def test_filter_distribcell(request): +def test_filter_distribcell(): harness = DistribcellTestHarness() - harness.request = request harness.main() diff --git a/tests/regression_tests/filter_energyfun/test.py b/tests/regression_tests/filter_energyfun/test.py index c4d0d60f97..d9148dd35d 100644 --- a/tests/regression_tests/filter_energyfun/test.py +++ b/tests/regression_tests/filter_energyfun/test.py @@ -42,7 +42,6 @@ class FilterEnergyFunHarness(PyAPITestHarness): return br_tally.get_pandas_dataframe().to_string() + '\n' -def test_filter_energyfun(request): +def test_filter_energyfun(): harness = FilterEnergyFunHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/filter_mesh/test.py b/tests/regression_tests/filter_mesh/test.py index e5a0baba1d..66cd1ac19f 100644 --- a/tests/regression_tests/filter_mesh/test.py +++ b/tests/regression_tests/filter_mesh/test.py @@ -63,7 +63,6 @@ class FilterMeshTestHarness(HashedPyAPITestHarness): self._model.tallies.append(tally) -def test_filter_mesh(request): +def test_filter_mesh(): harness = FilterMeshTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/fixed_source/test.py b/tests/regression_tests/fixed_source/test.py index e652ed3f82..7d98de9fc3 100644 --- a/tests/regression_tests/fixed_source/test.py +++ b/tests/regression_tests/fixed_source/test.py @@ -31,7 +31,7 @@ class FixedSourceTestHarness(PyAPITestHarness): return outstr -def test_fixed_source(request, reset_ids): +def test_fixed_source(): mat = openmc.Material() mat.add_nuclide('O16', 1.0) mat.add_nuclide('U238', 0.0001) @@ -56,5 +56,4 @@ def test_fixed_source(request, reset_ids): model.tallies.append(tally) harness = FixedSourceTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/infinite_cell/test.py b/tests/regression_tests/infinite_cell/test.py index 0e2d8454db..59abec3003 100644 --- a/tests/regression_tests/infinite_cell/test.py +++ b/tests/regression_tests/infinite_cell/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_infinite_cell(request): +def test_infinite_cell(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/iso_in_lab/test.py b/tests/regression_tests/iso_in_lab/test.py index 37bf05a069..0e8edc2186 100644 --- a/tests/regression_tests/iso_in_lab/test.py +++ b/tests/regression_tests/iso_in_lab/test.py @@ -1,9 +1,8 @@ from tests.testing_harness import PyAPITestHarness -def test_iso_in_lab(request): +def test_iso_in_lab(): # Force iso-in-lab scattering. harness = PyAPITestHarness('statepoint.10.h5') harness._model.materials.make_isotropic_in_lab() - harness.request = request harness.main() diff --git a/tests/regression_tests/lattice/test.py b/tests/regression_tests/lattice/test.py index 34c598680b..a32b9a629c 100644 --- a/tests/regression_tests/lattice/test.py +++ b/tests/regression_tests/lattice/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_lattice(request): +def test_lattice(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/lattice_hex/test.py b/tests/regression_tests/lattice_hex/test.py index b0028f3c52..eb63f84df5 100644 --- a/tests/regression_tests/lattice_hex/test.py +++ b/tests/regression_tests/lattice_hex/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_lattice_hex(request): +def test_lattice_hex(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/lattice_mixed/test.py b/tests/regression_tests/lattice_mixed/test.py index 2feb9a1381..3df1d7a4f3 100644 --- a/tests/regression_tests/lattice_mixed/test.py +++ b/tests/regression_tests/lattice_mixed/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_lattice_mixed(request): +def test_lattice_mixed(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/lattice_multiple/test.py b/tests/regression_tests/lattice_multiple/test.py index 15daf0beac..f0672d9a4e 100644 --- a/tests/regression_tests/lattice_multiple/test.py +++ b/tests/regression_tests/lattice_multiple/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_lattice_multiple(request): +def test_lattice_multiple(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_basic/test.py b/tests/regression_tests/mg_basic/test.py index 7b4ec247a6..3c22e60408 100644 --- a/tests/regression_tests/mg_basic/test.py +++ b/tests/regression_tests/mg_basic/test.py @@ -3,8 +3,7 @@ from openmc.examples import slab_mg from tests.testing_harness import PyAPITestHarness -def test_mg_basic(request, reset_ids): +def test_mg_basic(): model = slab_mg() harness = PyAPITestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_convert/test.py b/tests/regression_tests/mg_convert/test.py index f51e4e87b9..e6a8690c22 100755 --- a/tests/regression_tests/mg_convert/test.py +++ b/tests/regression_tests/mg_convert/test.py @@ -198,7 +198,6 @@ class MGXSTestHarness(PyAPITestHarness): self._cleanup() -def test_mg_convert(request): +def test_mg_convert(): harness = MGXSTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_legendre/test.py b/tests/regression_tests/mg_legendre/test.py index 58ea4a1dc4..5a57f758e8 100644 --- a/tests/regression_tests/mg_legendre/test.py +++ b/tests/regression_tests/mg_legendre/test.py @@ -3,10 +3,9 @@ from openmc.examples import slab_mg from tests.testing_harness import PyAPITestHarness -def test_mg_legendre(request, reset_ids): +def test_mg_legendre(): model = slab_mg(reps=['iso']) model.settings.tabular_legendre = {'enable': False} harness = PyAPITestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_max_order/test.py b/tests/regression_tests/mg_max_order/test.py index 72bca32317..20cc4f805d 100644 --- a/tests/regression_tests/mg_max_order/test.py +++ b/tests/regression_tests/mg_max_order/test.py @@ -3,9 +3,8 @@ from openmc.examples import slab_mg from tests.testing_harness import PyAPITestHarness -def test_mg_max_order(request, reset_ids): +def test_mg_max_order(): model = slab_mg(reps=['iso']) model.settings.max_order = 1 harness = PyAPITestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_nuclide/test.py b/tests/regression_tests/mg_nuclide/test.py index 53eac5e8d5..44206ef28f 100644 --- a/tests/regression_tests/mg_nuclide/test.py +++ b/tests/regression_tests/mg_nuclide/test.py @@ -3,8 +3,7 @@ from openmc.examples import slab_mg from tests.testing_harness import PyAPITestHarness -def test_mg_nuclide(request, reset_ids): +def test_mg_nuclide(): model = slab_mg(as_macro=False) harness = PyAPITestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_survival_biasing/test.py b/tests/regression_tests/mg_survival_biasing/test.py index 09a210d046..3c6c77a370 100644 --- a/tests/regression_tests/mg_survival_biasing/test.py +++ b/tests/regression_tests/mg_survival_biasing/test.py @@ -3,9 +3,8 @@ from openmc.examples import slab_mg from tests.testing_harness import PyAPITestHarness -def test_mg_survival_biasing(request, reset_ids): +def test_mg_survival_biasing(): model = slab_mg() model.settings.survival_biasing = True harness = PyAPITestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mg_tallies/test.py b/tests/regression_tests/mg_tallies/test.py index 3f9bcae79f..8952cc4ad8 100644 --- a/tests/regression_tests/mg_tallies/test.py +++ b/tests/regression_tests/mg_tallies/test.py @@ -4,7 +4,7 @@ from openmc.examples import slab_mg from tests.testing_harness import HashedPyAPITestHarness -def test_mg_tallies(request, reset_ids): +def test_mg_tallies(): model = slab_mg(as_macro=False) # Instantiate a tally mesh @@ -88,5 +88,4 @@ def test_mg_tallies(request, reset_ids): model.tallies.append(t) harness = HashedPyAPITestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/test.py b/tests/regression_tests/mgxs_library_ce_to_mg/test.py index 9246694ea9..9dc640acd1 100644 --- a/tests/regression_tests/mgxs_library_ce_to_mg/test.py +++ b/tests/regression_tests/mgxs_library_ce_to_mg/test.py @@ -76,10 +76,9 @@ class MGXSTestHarness(PyAPITestHarness): os.remove(f) -def test_mgxs_library_ce_to_mg(request, reset_ids): +def test_mgxs_library_ce_to_mg(): # Set the input set to use the pincell model model = pwr_pin_cell() harness = MGXSTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mgxs_library_condense/test.py b/tests/regression_tests/mgxs_library_condense/test.py index b7ecf8925c..06b4704784 100644 --- a/tests/regression_tests/mgxs_library_condense/test.py +++ b/tests/regression_tests/mgxs_library_condense/test.py @@ -60,9 +60,8 @@ class MGXSTestHarness(PyAPITestHarness): return outstr -def test_mgxs_library_condense(request, reset_ids): +def test_mgxs_library_condense(): # Use the pincell model model = pwr_pin_cell() harness = MGXSTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mgxs_library_distribcell/test.py b/tests/regression_tests/mgxs_library_distribcell/test.py index b9f343eafa..d7bc84bf57 100644 --- a/tests/regression_tests/mgxs_library_distribcell/test.py +++ b/tests/regression_tests/mgxs_library_distribcell/test.py @@ -64,8 +64,7 @@ class MGXSTestHarness(PyAPITestHarness): return outstr -def test_mgxs_library_distribcell(request, reset_ids): +def test_mgxs_library_distribcell(): model = pwr_assembly() harness = MGXSTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mgxs_library_hdf5/test.py b/tests/regression_tests/mgxs_library_hdf5/test.py index 38dbeef1a5..8eed0258aa 100644 --- a/tests/regression_tests/mgxs_library_hdf5/test.py +++ b/tests/regression_tests/mgxs_library_hdf5/test.py @@ -73,12 +73,11 @@ class MGXSTestHarness(PyAPITestHarness): os.remove(f) -def test_mgxs_library_hdf5(request, reset_ids): +def test_mgxs_library_hdf5(): try: np.set_printoptions(formatter={'float_kind': '{:.8e}'.format}) model = pwr_pin_cell() harness = MGXSTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() finally: np.set_printoptions(formatter=None) diff --git a/tests/regression_tests/mgxs_library_mesh/test.py b/tests/regression_tests/mgxs_library_mesh/test.py index 809782467d..70bd2113ce 100644 --- a/tests/regression_tests/mgxs_library_mesh/test.py +++ b/tests/regression_tests/mgxs_library_mesh/test.py @@ -65,7 +65,6 @@ class MGXSTestHarness(PyAPITestHarness): return outstr -def test_mgxs_library_mesh(request): +def test_mgxs_library_mesh(): harness = MGXSTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/mgxs_library_no_nuclides/test.py b/tests/regression_tests/mgxs_library_no_nuclides/test.py index 3e6e236480..c59b52189e 100644 --- a/tests/regression_tests/mgxs_library_no_nuclides/test.py +++ b/tests/regression_tests/mgxs_library_no_nuclides/test.py @@ -57,8 +57,7 @@ class MGXSTestHarness(PyAPITestHarness): return outstr -def test_mgxs_library_no_nuclides(request, reset_ids): +def test_mgxs_library_no_nuclides(): model = pwr_pin_cell() harness = MGXSTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/mgxs_library_nuclides/test.py b/tests/regression_tests/mgxs_library_nuclides/test.py index c670e18e30..a65fb9a6d3 100644 --- a/tests/regression_tests/mgxs_library_nuclides/test.py +++ b/tests/regression_tests/mgxs_library_nuclides/test.py @@ -53,8 +53,7 @@ class MGXSTestHarness(PyAPITestHarness): return outstr -def test_mgxs_library_nuclides(request, reset_ids): +def test_mgxs_library_nuclides(): model = pwr_pin_cell() harness = MGXSTestHarness('statepoint.10.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/multipole/test.py b/tests/regression_tests/multipole/test.py index d7ed3ca7c0..43aa9963aa 100644 --- a/tests/regression_tests/multipole/test.py +++ b/tests/regression_tests/multipole/test.py @@ -80,8 +80,7 @@ class MultipoleTestHarness(PyAPITestHarness): return outstr -def test_multipole(request, reset_ids): +def test_multipole(): model = make_model() harness = MultipoleTestHarness('statepoint.5.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/output/test.py b/tests/regression_tests/output/test.py index 30fcc3a80c..d9568ba4b0 100644 --- a/tests/regression_tests/output/test.py +++ b/tests/regression_tests/output/test.py @@ -23,7 +23,6 @@ class OutputTestHarness(TestHarness): os.remove(f) -def test_output(request): +def test_output(): harness = OutputTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/particle_restart_eigval/test.py b/tests/regression_tests/particle_restart_eigval/test.py index 6b9d103fdb..a30eb97870 100644 --- a/tests/regression_tests/particle_restart_eigval/test.py +++ b/tests/regression_tests/particle_restart_eigval/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import ParticleRestartTestHarness -def test_particle_restart_eigval(request): +def test_particle_restart_eigval(): harness = ParticleRestartTestHarness('particle_10_1030.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/particle_restart_fixed/test.py b/tests/regression_tests/particle_restart_fixed/test.py index 428d9586d9..463568ecca 100644 --- a/tests/regression_tests/particle_restart_fixed/test.py +++ b/tests/regression_tests/particle_restart_fixed/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import ParticleRestartTestHarness -def test_particle_restart_fixed(request): +def test_particle_restart_fixed(): harness = ParticleRestartTestHarness('particle_7_144.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/periodic/test.py b/tests/regression_tests/periodic/test.py index 188827a5dc..d746ebdd5f 100644 --- a/tests/regression_tests/periodic/test.py +++ b/tests/regression_tests/periodic/test.py @@ -51,7 +51,6 @@ class PeriodicTest(PyAPITestHarness): settings.export_to_xml() -def test_periodic(request): +def test_periodic(): harness = PeriodicTest('statepoint.4.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/plot/test.py b/tests/regression_tests/plot/test.py index 1e7773ea6a..64f2d4d31a 100644 --- a/tests/regression_tests/plot/test.py +++ b/tests/regression_tests/plot/test.py @@ -56,8 +56,7 @@ class PlotTestHarness(TestHarness): return outstr -def test_plot(request): +def test_plot(): harness = PlotTestHarness(('plot_1.ppm', 'plot_2.ppm', 'plot_3.ppm', 'plot_4.h5')) - harness.request = request harness.main() diff --git a/tests/regression_tests/ptables_off/test.py b/tests/regression_tests/ptables_off/test.py index 8d67cf400b..cc316f8c3e 100644 --- a/tests/regression_tests/ptables_off/test.py +++ b/tests/regression_tests/ptables_off/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_ptables_off(request): +def test_ptables_off(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/quadric_surfaces/test.py b/tests/regression_tests/quadric_surfaces/test.py index f919f1648c..862ee9bf41 100755 --- a/tests/regression_tests/quadric_surfaces/test.py +++ b/tests/regression_tests/quadric_surfaces/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_quadric_surfaces(request): +def test_quadric_surfaces(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/reflective_plane/test.py b/tests/regression_tests/reflective_plane/test.py index ba693c61aa..906174f338 100644 --- a/tests/regression_tests/reflective_plane/test.py +++ b/tests/regression_tests/reflective_plane/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_reflective_plane(request): +def test_reflective_plane(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/resonance_scattering/test.py b/tests/regression_tests/resonance_scattering/test.py index 98096a0cac..15e9d68944 100644 --- a/tests/regression_tests/resonance_scattering/test.py +++ b/tests/regression_tests/resonance_scattering/test.py @@ -42,7 +42,6 @@ class ResonanceScatteringTestHarness(PyAPITestHarness): settings.export_to_xml() -def test_resonance_scattering(request): +def test_resonance_scattering(): harness = ResonanceScatteringTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/rotation/test.py b/tests/regression_tests/rotation/test.py index b27e7faa4b..31c3d8d655 100644 --- a/tests/regression_tests/rotation/test.py +++ b/tests/regression_tests/rotation/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_rotation(request): +def test_rotation(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/salphabeta/test.py b/tests/regression_tests/salphabeta/test.py index 62ccbb2267..e69ada5ba3 100644 --- a/tests/regression_tests/salphabeta/test.py +++ b/tests/regression_tests/salphabeta/test.py @@ -73,8 +73,7 @@ def make_model(): return model -def test_salphabeta(request, reset_ids): +def test_salphabeta(): model = make_model() harness = PyAPITestHarness('statepoint.5.h5', model) - harness.request = request harness.main() diff --git a/tests/regression_tests/score_current/test.py b/tests/regression_tests/score_current/test.py index 1acc7c604f..21c5d08812 100644 --- a/tests/regression_tests/score_current/test.py +++ b/tests/regression_tests/score_current/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import HashedTestHarness -def test_score_current(request): +def test_score_current(): harness = HashedTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/seed/test.py b/tests/regression_tests/seed/test.py index 4c6bf95dc2..8b2f031b3e 100644 --- a/tests/regression_tests/seed/test.py +++ b/tests/regression_tests/seed/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_seed(request): +def test_seed(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/source/test.py b/tests/regression_tests/source/test.py index aa17143f0d..00171a2551 100644 --- a/tests/regression_tests/source/test.py +++ b/tests/regression_tests/source/test.py @@ -58,7 +58,6 @@ class SourceTestHarness(PyAPITestHarness): settings.export_to_xml() -def test_source(request): +def test_source(): harness = SourceTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/source_file/test.py b/tests/regression_tests/source_file/test.py index 1989de4c90..b4d9c4a31d 100644 --- a/tests/regression_tests/source_file/test.py +++ b/tests/regression_tests/source_file/test.py @@ -96,7 +96,6 @@ class SourceFileTestHarness(TestHarness): fh.write(settings1) -def test_source_file(request): +def test_source_file(): harness = SourceFileTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/sourcepoint_batch/test.py b/tests/regression_tests/sourcepoint_batch/test.py index 96326d15b8..3086b5610d 100644 --- a/tests/regression_tests/sourcepoint_batch/test.py +++ b/tests/regression_tests/sourcepoint_batch/test.py @@ -26,7 +26,6 @@ class SourcepointTestHarness(TestHarness): return outstr -def test_sourcepoint_batch(request): +def test_sourcepoint_batch(): harness = SourcepointTestHarness('statepoint.08.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/sourcepoint_latest/test.py b/tests/regression_tests/sourcepoint_latest/test.py index 15082e6d82..d14b566ad8 100644 --- a/tests/regression_tests/sourcepoint_latest/test.py +++ b/tests/regression_tests/sourcepoint_latest/test.py @@ -13,7 +13,6 @@ class SourcepointTestHarness(TestHarness): 'exist.' -def test_sourcepoint_latest(request): +def test_sourcepoint_latest(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/sourcepoint_restart/test.py b/tests/regression_tests/sourcepoint_restart/test.py index b0d2e9069a..32f53ec238 100644 --- a/tests/regression_tests/sourcepoint_restart/test.py +++ b/tests/regression_tests/sourcepoint_restart/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_sourcepoint_restart(request): +def test_sourcepoint_restart(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/statepoint_batch/test.py b/tests/regression_tests/statepoint_batch/test.py index aeb91e2a6e..6c5e4de318 100644 --- a/tests/regression_tests/statepoint_batch/test.py +++ b/tests/regression_tests/statepoint_batch/test.py @@ -13,7 +13,6 @@ class StatepointTestHarness(TestHarness): TestHarness._test_output_created(self) -def test_statepoint_batch(request): +def test_statepoint_batch(): harness = StatepointTestHarness() - harness.request = request harness.main() diff --git a/tests/regression_tests/statepoint_restart/test.py b/tests/regression_tests/statepoint_restart/test.py index 219a8a7ed8..2ee2e7be79 100644 --- a/tests/regression_tests/statepoint_restart/test.py +++ b/tests/regression_tests/statepoint_restart/test.py @@ -54,8 +54,7 @@ class StatepointRestartTestHarness(TestHarness): openmc.run(openmc_exec=self._opts.exe, restart_file=statepoint) -def test_statepoint_restart(request): +def test_statepoint_restart(): harness = StatepointRestartTestHarness('statepoint.10.h5', 'statepoint.07.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/statepoint_sourcesep/test.py b/tests/regression_tests/statepoint_sourcesep/test.py index 44a45d406f..3d63ca8ee5 100644 --- a/tests/regression_tests/statepoint_sourcesep/test.py +++ b/tests/regression_tests/statepoint_sourcesep/test.py @@ -20,7 +20,6 @@ class SourcepointTestHarness(TestHarness): os.remove(f) -def test_statepoint_sourcesep(request): +def test_statepoint_sourcesep(): harness = SourcepointTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/surface_tally/test.py b/tests/regression_tests/surface_tally/test.py index 2d499cb293..6995b7780c 100644 --- a/tests/regression_tests/surface_tally/test.py +++ b/tests/regression_tests/surface_tally/test.py @@ -174,7 +174,6 @@ class SurfaceTallyTestHarness(PyAPITestHarness): return outstr -def test_surface_tally(request): +def test_surface_tally(): harness = SurfaceTallyTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/survival_biasing/test.py b/tests/regression_tests/survival_biasing/test.py index 2dc7c86ab1..39e6faed8e 100644 --- a/tests/regression_tests/survival_biasing/test.py +++ b/tests/regression_tests/survival_biasing/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_survival_biasing(request): +def test_survival_biasing(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/tallies/test.py b/tests/regression_tests/tallies/test.py index 3f6f7de748..e3aebfd986 100644 --- a/tests/regression_tests/tallies/test.py +++ b/tests/regression_tests/tallies/test.py @@ -4,9 +4,8 @@ from openmc import Mesh, Tally, Tallies from tests.testing_harness import HashedPyAPITestHarness -def test_tallies(request, reset_ids): +def test_tallies(): harness = HashedPyAPITestHarness('statepoint.5.h5') - harness.request = request model = harness._model # Set settings explicitly diff --git a/tests/regression_tests/tally_aggregation/test.py b/tests/regression_tests/tally_aggregation/test.py index dfa0266902..f723160737 100644 --- a/tests/regression_tests/tally_aggregation/test.py +++ b/tests/regression_tests/tally_aggregation/test.py @@ -61,7 +61,6 @@ class TallyAggregationTestHarness(PyAPITestHarness): return outstr -def test_tally_aggregation(request): +def test_tally_aggregation(): harness = TallyAggregationTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/tally_arithmetic/test.py b/tests/regression_tests/tally_arithmetic/test.py index c87d0149f4..469ed00de1 100644 --- a/tests/regression_tests/tally_arithmetic/test.py +++ b/tests/regression_tests/tally_arithmetic/test.py @@ -75,7 +75,6 @@ class TallyArithmeticTestHarness(PyAPITestHarness): return outstr -def test_tally_arithmetic(request): +def test_tally_arithmetic(): harness = TallyArithmeticTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/tally_assumesep/test.py b/tests/regression_tests/tally_assumesep/test.py index c4248c10af..64595ced22 100644 --- a/tests/regression_tests/tally_assumesep/test.py +++ b/tests/regression_tests/tally_assumesep/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_tally_assumesep(request): +def test_tally_assumesep(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/tally_nuclides/test.py b/tests/regression_tests/tally_nuclides/test.py index 7eec5ef3f1..ee1f4b600e 100644 --- a/tests/regression_tests/tally_nuclides/test.py +++ b/tests/regression_tests/tally_nuclides/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_tally_nuclides(request): +def test_tally_nuclides(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/tally_slice_merge/test.py b/tests/regression_tests/tally_slice_merge/test.py index 4ee99d34a8..c198411f7d 100644 --- a/tests/regression_tests/tally_slice_merge/test.py +++ b/tests/regression_tests/tally_slice_merge/test.py @@ -166,7 +166,6 @@ class TallySliceMergeTestHarness(PyAPITestHarness): return outstr -def test_tally_slice_merge(request): +def test_tally_slice_merge(): harness = TallySliceMergeTestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/trace/test.py b/tests/regression_tests/trace/test.py index c037bb23bf..79dcaa1060 100644 --- a/tests/regression_tests/trace/test.py +++ b/tests/regression_tests/trace/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_trace(request): +def test_trace(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/track_output/test.py b/tests/regression_tests/track_output/test.py index f3d665e11e..22eac03bfc 100644 --- a/tests/regression_tests/track_output/test.py +++ b/tests/regression_tests/track_output/test.py @@ -38,10 +38,9 @@ class TrackTestHarness(TestHarness): os.remove(f) -def test_track_output(request): +def test_track_output(): # If vtk python module is not available, we can't run track.py so skip this # test. vtk = pytest.importorskip('vtk') harness = TrackTestHarness('statepoint.2.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/translation/test.py b/tests/regression_tests/translation/test.py index 29ef1c0114..876db736b9 100644 --- a/tests/regression_tests/translation/test.py +++ b/tests/regression_tests/translation/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_translation(request): +def test_translation(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/trigger_batch_interval/test.py b/tests/regression_tests/trigger_batch_interval/test.py index 1ac01a08bf..e161745022 100644 --- a/tests/regression_tests/trigger_batch_interval/test.py +++ b/tests/regression_tests/trigger_batch_interval/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_trigger_batch_interval(request): +def test_trigger_batch_interval(): harness = TestHarness('statepoint.15.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/trigger_no_batch_interval/test.py b/tests/regression_tests/trigger_no_batch_interval/test.py index d38304feea..4a40def5aa 100644 --- a/tests/regression_tests/trigger_no_batch_interval/test.py +++ b/tests/regression_tests/trigger_no_batch_interval/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_trigger_no_batch_interval(request): +def test_trigger_no_batch_interval(): harness = TestHarness('statepoint.15.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/trigger_no_status/test.py b/tests/regression_tests/trigger_no_status/test.py index 98173f8dda..75ae9a8cc9 100644 --- a/tests/regression_tests/trigger_no_status/test.py +++ b/tests/regression_tests/trigger_no_status/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_trigger_no_status(request): +def test_trigger_no_status(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/trigger_tallies/test.py b/tests/regression_tests/trigger_tallies/test.py index fde7298ffe..f8493c0c68 100644 --- a/tests/regression_tests/trigger_tallies/test.py +++ b/tests/regression_tests/trigger_tallies/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_trigger_tallies(request): +def test_trigger_tallies(): harness = TestHarness('statepoint.15.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/triso/test.py b/tests/regression_tests/triso/test.py index 2da26d1d38..174bba94fd 100644 --- a/tests/regression_tests/triso/test.py +++ b/tests/regression_tests/triso/test.py @@ -90,7 +90,6 @@ class TRISOTestHarness(PyAPITestHarness): mats.export_to_xml() -def test_triso(request): +def test_triso(): harness = TRISOTestHarness('statepoint.5.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/uniform_fs/test.py b/tests/regression_tests/uniform_fs/test.py index 553484e0ab..64d997909c 100644 --- a/tests/regression_tests/uniform_fs/test.py +++ b/tests/regression_tests/uniform_fs/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_uniform_fs(request): +def test_uniform_fs(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/universe/test.py b/tests/regression_tests/universe/test.py index 5da34d90c8..d5ed9645bd 100644 --- a/tests/regression_tests/universe/test.py +++ b/tests/regression_tests/universe/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_universe(request): +def test_universe(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/void/test.py b/tests/regression_tests/void/test.py index a08813c45b..af16f2ac80 100644 --- a/tests/regression_tests/void/test.py +++ b/tests/regression_tests/void/test.py @@ -1,7 +1,6 @@ from tests.testing_harness import TestHarness -def test_void(request): +def test_void(): harness = TestHarness('statepoint.10.h5') - harness.request = request harness.main() diff --git a/tests/regression_tests/volume_calc/test.py b/tests/regression_tests/volume_calc/test.py index da3a66c36f..a6b62b9be9 100644 --- a/tests/regression_tests/volume_calc/test.py +++ b/tests/regression_tests/volume_calc/test.py @@ -73,7 +73,6 @@ class VolumeTest(PyAPITestHarness): def _test_output_created(self): pass -def test_volume_calc(request): +def test_volume_calc(): harness = VolumeTest('') - harness.request = request harness.main() diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 9aee4f741a..9901dcb718 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -32,14 +32,10 @@ class TestHarness(object): def main(self): """Accept commandline arguments and either run or update tests.""" (self._opts, self._args) = self.parser.parse_args() - try: - olddir = self.request.fspath.dirpath().chdir() - if self._opts.update: - self.update_results() - else: - self.execute_test() - finally: - olddir.chdir() + 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.""" @@ -237,7 +233,6 @@ class PyAPITestHarness(TestHarness): super(PyAPITestHarness, self).__init__(statepoint_name) self.parser.add_option('-b', '--build-inputs', dest='build_only', action='store_true', default=False) - openmc.reset_auto_ids() if model is None: self._model = pwr_core() else: @@ -248,16 +243,12 @@ class PyAPITestHarness(TestHarness): def main(self): """Accept commandline arguments and either run or update tests.""" (self._opts, self._args) = self.parser.parse_args() - try: - olddir = self.request.fspath.dirpath().chdir() - if self._opts.build_only: - self._build_inputs() - elif self._opts.update: - self.update_results() - else: - self.execute_test() - finally: - olddir.chdir() + if self._opts.build_only: + self._build_inputs() + elif self._opts.update: + self.update_results() + else: + self.execute_test() def execute_test(self): """Build input XMLs, run OpenMC, and verify correct results."""