From 03a8fb64e6d8b54a4b24dbc2c9057fcdae7f9395 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sat, 3 Oct 2015 11:28:36 -0400 Subject: [PATCH] Address @paulromano comments on #469 --- tests/test_basic/test_basic.py | 1 - tests/test_cmfd_feed/test_cmfd_feed.py | 1 - tests/test_cmfd_nofeed/test_cmfd_nofeed.py | 1 - tests/test_confidence_intervals/test_confidence_intervals.py | 1 - tests/test_density_atombcm/test_density_atombcm.py | 1 - tests/test_density_atomcm3/test_density_atomcm3.py | 1 - tests/test_density_kgm3/test_density_kgm3.py | 1 - tests/test_density_sum/test_density_sum.py | 1 - .../test_eigenvalue_genperbatch.py | 1 - .../test_eigenvalue_no_inactive.py | 1 - tests/test_energy_grid/test_energy_grid.py | 1 - tests/test_entropy/test_entropy.py | 1 - tests/test_filter_cell/test_filter_cell.py | 5 ++--- tests/test_filter_cellborn/test_filter_cellborn.py | 5 ++--- tests/test_filter_distribcell/test_filter_distribcell.py | 1 - tests/test_filter_energy/test_filter_energy.py | 5 ++--- tests/test_filter_energyout/test_filter_energyout.py | 5 ++--- .../test_filter_group_transfer/test_filter_group_transfer.py | 5 ++--- tests/test_filter_material/test_filter_material.py | 5 ++--- tests/test_filter_mesh_2d/test_filter_mesh_2d.py | 1 - tests/test_filter_mesh_3d/test_filter_mesh_3d.py | 1 - tests/test_filter_universe/test_filter_universe.py | 5 ++--- tests/test_fixed_source/test_fixed_source.py | 1 - tests/test_infinite_cell/test_infinite_cell.py | 1 - tests/test_lattice/test_lattice.py | 1 - tests/test_lattice_hex/test_lattice_hex.py | 1 - tests/test_lattice_mixed/test_lattice_mixed.py | 1 - tests/test_lattice_multiple/test_lattice_multiple.py | 1 - tests/test_many_scores/test_many_scores.py | 1 - tests/test_natural_element/test_natural_element.py | 1 - tests/test_output/test_output.py | 1 - .../test_particle_restart_eigval.py | 1 - .../test_particle_restart_fixed.py | 1 - tests/test_plot_background/test_plot_background.py | 1 - tests/test_plot_basis/test_plot_basis.py | 1 - tests/test_plot_colspec/test_plot_colspec.py | 1 - tests/test_plot_mask/test_plot_mask.py | 1 - tests/test_ptables_off/test_ptables_off.py | 1 - tests/test_reflective_cone/test_reflective_cone.py | 1 - tests/test_reflective_cylinder/test_reflective_cylinder.py | 1 - tests/test_reflective_plane/test_reflective_plane.py | 1 - tests/test_reflective_sphere/test_reflective_sphere.py | 1 - tests/test_resonance_scattering/test_resonance_scattering.py | 1 - tests/test_rotation/test_rotation.py | 1 - tests/test_salphabeta/test_salphabeta.py | 1 - tests/test_salphabeta_multiple/test_salphabeta_multiple.py | 1 - tests/test_score_MT/test_score_MT.py | 5 ++--- tests/test_score_absorption/test_score_absorption.py | 5 ++--- tests/test_score_current/test_score_current.py | 1 - tests/test_score_events/test_score_events.py | 5 ++--- tests/test_score_fission/test_score_fission.py | 5 ++--- tests/test_score_flux/test_score_flux.py | 5 ++--- tests/test_score_flux_yn/test_score_flux_yn.py | 5 ++--- tests/test_score_kappafission/test_score_kappafission.py | 5 ++--- tests/test_score_nufission/test_score_nufission.py | 5 ++--- tests/test_score_nuscatter/test_score_nuscatter.py | 3 +-- tests/test_score_nuscatter_n/test_score_nuscatter_n.py | 3 +-- tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py | 3 +-- tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py | 3 +-- tests/test_score_scatter/test_score_scatter.py | 5 ++--- tests/test_score_scatter_n/test_score_scatter_n.py | 5 ++--- tests/test_score_scatter_pn/test_score_scatter_pn.py | 5 ++--- tests/test_score_scatter_yn/test_score_scatter_yn.py | 5 ++--- tests/test_score_total/test_score_total.py | 5 ++--- tests/test_score_total_yn/test_score_total_yn.py | 5 ++--- tests/test_seed/test_seed.py | 1 - tests/test_source_angle_mono/test_source_angle_mono.py | 1 - .../test_source_energy_maxwell/test_source_energy_maxwell.py | 1 - tests/test_source_energy_mono/test_source_energy_mono.py | 1 - tests/test_source_file/test_source_file.py | 1 - tests/test_source_point/test_source_point.py | 1 - tests/test_sourcepoint_batch/test_sourcepoint_batch.py | 1 - tests/test_sourcepoint_interval/test_sourcepoint_interval.py | 1 - tests/test_sourcepoint_latest/test_sourcepoint_latest.py | 1 - tests/test_sourcepoint_restart/test_sourcepoint_restart.py | 1 - tests/test_statepoint_batch/test_statepoint_batch.py | 1 - tests/test_statepoint_interval/test_statepoint_interval.py | 1 - tests/test_statepoint_restart/test_statepoint_restart.py | 1 - tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py | 1 - tests/test_survival_biasing/test_survival_biasing.py | 1 - tests/test_tally_assumesep/test_tally_assumesep.py | 1 - tests/test_tally_nuclides/test_tally_nuclides.py | 1 - tests/test_trace/test_trace.py | 1 - tests/test_track_output/test_track_output.py | 1 - tests/test_translation/test_translation.py | 1 - .../test_trigger_batch_interval.py | 1 - .../test_trigger_no_batch_interval.py | 1 - tests/test_trigger_no_status/test_trigger_no_status.py | 1 - tests/test_trigger_tallies/test_trigger_tallies.py | 1 - tests/test_uniform_fs/test_uniform_fs.py | 1 - tests/test_union_energy_grids/test_union_energy_grids.py | 1 - tests/test_universe/test_universe.py | 1 - tests/test_void/test_void.py | 1 - tests/testing_harness.py | 2 +- 94 files changed, 47 insertions(+), 140 deletions(-) diff --git a/tests/test_basic/test_basic.py b/tests/test_basic/test_basic.py index 835bf91c7b..2a595f3e66 100755 --- a/tests/test_basic/test_basic.py +++ b/tests/test_basic/test_basic.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_cmfd_feed/test_cmfd_feed.py b/tests/test_cmfd_feed/test_cmfd_feed.py index af1f0542d4..3bc5f61743 100644 --- a/tests/test_cmfd_feed/test_cmfd_feed.py +++ b/tests/test_cmfd_feed/test_cmfd_feed.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import CMFDTestHarness diff --git a/tests/test_cmfd_nofeed/test_cmfd_nofeed.py b/tests/test_cmfd_nofeed/test_cmfd_nofeed.py index af1f0542d4..3bc5f61743 100644 --- a/tests/test_cmfd_nofeed/test_cmfd_nofeed.py +++ b/tests/test_cmfd_nofeed/test_cmfd_nofeed.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import CMFDTestHarness diff --git a/tests/test_confidence_intervals/test_confidence_intervals.py b/tests/test_confidence_intervals/test_confidence_intervals.py index 67227ca324..ed6addec45 100755 --- a/tests/test_confidence_intervals/test_confidence_intervals.py +++ b/tests/test_confidence_intervals/test_confidence_intervals.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_density_atombcm/test_density_atombcm.py b/tests/test_density_atombcm/test_density_atombcm.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_density_atombcm/test_density_atombcm.py +++ b/tests/test_density_atombcm/test_density_atombcm.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_density_atomcm3/test_density_atomcm3.py b/tests/test_density_atomcm3/test_density_atomcm3.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_density_atomcm3/test_density_atomcm3.py +++ b/tests/test_density_atomcm3/test_density_atomcm3.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_density_kgm3/test_density_kgm3.py b/tests/test_density_kgm3/test_density_kgm3.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_density_kgm3/test_density_kgm3.py +++ b/tests/test_density_kgm3/test_density_kgm3.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_density_sum/test_density_sum.py b/tests/test_density_sum/test_density_sum.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_density_sum/test_density_sum.py +++ b/tests/test_density_sum/test_density_sum.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py b/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py index 3b0d22b9ea..d6f69fdbb5 100644 --- a/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py +++ b/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py b/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py +++ b/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_energy_grid/test_energy_grid.py b/tests/test_energy_grid/test_energy_grid.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_energy_grid/test_energy_grid.py +++ b/tests/test_energy_grid/test_energy_grid.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_entropy/test_entropy.py b/tests/test_entropy/test_entropy.py index 1af8945e34..113cafcb27 100644 --- a/tests/test_entropy/test_entropy.py +++ b/tests/test_entropy/test_entropy.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness from openmc.statepoint import StatePoint diff --git a/tests/test_filter_cell/test_filter_cell.py b/tests/test_filter_cell/test_filter_cell.py index 767007d7ab..d532d59cf8 100644 --- a/tests/test_filter_cell/test_filter_cell.py +++ b/tests/test_filter_cell/test_filter_cell.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -17,10 +16,10 @@ class FilterCellTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterCellTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterCellTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_filter_cellborn/test_filter_cellborn.py b/tests/test_filter_cellborn/test_filter_cellborn.py index 14b50137eb..2fac6a1fcd 100644 --- a/tests/test_filter_cellborn/test_filter_cellborn.py +++ b/tests/test_filter_cellborn/test_filter_cellborn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -17,10 +16,10 @@ class FilterCellbornTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterCellbornTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterCellbornTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_filter_distribcell/test_filter_distribcell.py b/tests/test_filter_distribcell/test_filter_distribcell.py index a0ed938ba3..872d29552b 100644 --- a/tests/test_filter_distribcell/test_filter_distribcell.py +++ b/tests/test_filter_distribcell/test_filter_distribcell.py @@ -5,7 +5,6 @@ import hashlib import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import * diff --git a/tests/test_filter_energy/test_filter_energy.py b/tests/test_filter_energy/test_filter_energy.py index 55e7e55c65..54d1dd4b7f 100644 --- a/tests/test_filter_energy/test_filter_energy.py +++ b/tests/test_filter_energy/test_filter_energy.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -18,10 +17,10 @@ class FilterEnergyTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterEnergyTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterEnergyTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_filter_energyout/test_filter_energyout.py b/tests/test_filter_energyout/test_filter_energyout.py index d1fda4e0da..43a8c7d5a9 100644 --- a/tests/test_filter_energyout/test_filter_energyout.py +++ b/tests/test_filter_energyout/test_filter_energyout.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -18,10 +17,10 @@ class FilterEnergyoutTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterEnergyoutTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterEnergyoutTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_filter_group_transfer/test_filter_group_transfer.py b/tests/test_filter_group_transfer/test_filter_group_transfer.py index fcffc45d11..cbea5e0a7f 100644 --- a/tests/test_filter_group_transfer/test_filter_group_transfer.py +++ b/tests/test_filter_group_transfer/test_filter_group_transfer.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -22,10 +21,10 @@ class FilterGroupTransferTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterGroupTransferTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterGroupTransferTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_filter_material/test_filter_material.py b/tests/test_filter_material/test_filter_material.py index 8d66e822eb..8e42d8c9a2 100644 --- a/tests/test_filter_material/test_filter_material.py +++ b/tests/test_filter_material/test_filter_material.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -17,10 +16,10 @@ class FilterMaterialTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterMaterialTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterMaterialTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py index 67227ca324..ed6addec45 100644 --- a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py +++ b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py index 67227ca324..ed6addec45 100644 --- a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py +++ b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_filter_universe/test_filter_universe.py b/tests/test_filter_universe/test_filter_universe.py index 1bd62d0b27..00dd166196 100644 --- a/tests/test_filter_universe/test_filter_universe.py +++ b/tests/test_filter_universe/test_filter_universe.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -17,10 +16,10 @@ class FilterUniverseTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(tally) - PyAPITestHarness._build_inputs(self) + super(FilterUniverseTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(FilterUniverseTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_fixed_source/test_fixed_source.py b/tests/test_fixed_source/test_fixed_source.py index 2a41345f6a..12dbb8d769 100644 --- a/tests/test_fixed_source/test_fixed_source.py +++ b/tests/test_fixed_source/test_fixed_source.py @@ -5,7 +5,6 @@ import os import sys import numpy as np sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness from openmc.statepoint import StatePoint diff --git a/tests/test_infinite_cell/test_infinite_cell.py b/tests/test_infinite_cell/test_infinite_cell.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_infinite_cell/test_infinite_cell.py +++ b/tests/test_infinite_cell/test_infinite_cell.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_lattice/test_lattice.py b/tests/test_lattice/test_lattice.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_lattice/test_lattice.py +++ b/tests/test_lattice/test_lattice.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_lattice_hex/test_lattice_hex.py b/tests/test_lattice_hex/test_lattice_hex.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_lattice_hex/test_lattice_hex.py +++ b/tests/test_lattice_hex/test_lattice_hex.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_lattice_mixed/test_lattice_mixed.py b/tests/test_lattice_mixed/test_lattice_mixed.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_lattice_mixed/test_lattice_mixed.py +++ b/tests/test_lattice_mixed/test_lattice_mixed.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_lattice_multiple/test_lattice_multiple.py b/tests/test_lattice_multiple/test_lattice_multiple.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_lattice_multiple/test_lattice_multiple.py +++ b/tests/test_lattice_multiple/test_lattice_multiple.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_many_scores/test_many_scores.py b/tests/test_many_scores/test_many_scores.py index 4518fc3637..88c3bdfb3d 100644 --- a/tests/test_many_scores/test_many_scores.py +++ b/tests/test_many_scores/test_many_scores.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_natural_element/test_natural_element.py b/tests/test_natural_element/test_natural_element.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_natural_element/test_natural_element.py +++ b/tests/test_natural_element/test_natural_element.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_output/test_output.py b/tests/test_output/test_output.py index 007d3952de..8e36ead808 100644 --- a/tests/test_output/test_output.py +++ b/tests/test_output/test_output.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py index 38441f1529..139cb2b9f5 100644 --- a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py +++ b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import ParticleRestartTestHarness diff --git a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py index dd74fa4f5b..5af7454894 100644 --- a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py +++ b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import ParticleRestartTestHarness diff --git a/tests/test_plot_background/test_plot_background.py b/tests/test_plot_background/test_plot_background.py index b769f2d3dc..7890eca19d 100644 --- a/tests/test_plot_background/test_plot_background.py +++ b/tests/test_plot_background/test_plot_background.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import PlotTestHarness diff --git a/tests/test_plot_basis/test_plot_basis.py b/tests/test_plot_basis/test_plot_basis.py index 34b7486247..d45479e256 100644 --- a/tests/test_plot_basis/test_plot_basis.py +++ b/tests/test_plot_basis/test_plot_basis.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import PlotTestHarness diff --git a/tests/test_plot_colspec/test_plot_colspec.py b/tests/test_plot_colspec/test_plot_colspec.py index b769f2d3dc..7890eca19d 100644 --- a/tests/test_plot_colspec/test_plot_colspec.py +++ b/tests/test_plot_colspec/test_plot_colspec.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import PlotTestHarness diff --git a/tests/test_plot_mask/test_plot_mask.py b/tests/test_plot_mask/test_plot_mask.py index 34b7486247..d45479e256 100644 --- a/tests/test_plot_mask/test_plot_mask.py +++ b/tests/test_plot_mask/test_plot_mask.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import PlotTestHarness diff --git a/tests/test_ptables_off/test_ptables_off.py b/tests/test_ptables_off/test_ptables_off.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_ptables_off/test_ptables_off.py +++ b/tests/test_ptables_off/test_ptables_off.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_reflective_cone/test_reflective_cone.py b/tests/test_reflective_cone/test_reflective_cone.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_reflective_cone/test_reflective_cone.py +++ b/tests/test_reflective_cone/test_reflective_cone.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_reflective_cylinder/test_reflective_cylinder.py b/tests/test_reflective_cylinder/test_reflective_cylinder.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_reflective_cylinder/test_reflective_cylinder.py +++ b/tests/test_reflective_cylinder/test_reflective_cylinder.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_reflective_plane/test_reflective_plane.py b/tests/test_reflective_plane/test_reflective_plane.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_reflective_plane/test_reflective_plane.py +++ b/tests/test_reflective_plane/test_reflective_plane.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_reflective_sphere/test_reflective_sphere.py b/tests/test_reflective_sphere/test_reflective_sphere.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_reflective_sphere/test_reflective_sphere.py +++ b/tests/test_reflective_sphere/test_reflective_sphere.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_resonance_scattering/test_resonance_scattering.py b/tests/test_resonance_scattering/test_resonance_scattering.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_resonance_scattering/test_resonance_scattering.py +++ b/tests/test_resonance_scattering/test_resonance_scattering.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_rotation/test_rotation.py b/tests/test_rotation/test_rotation.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_rotation/test_rotation.py +++ b/tests/test_rotation/test_rotation.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_salphabeta/test_salphabeta.py b/tests/test_salphabeta/test_salphabeta.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_salphabeta/test_salphabeta.py +++ b/tests/test_salphabeta/test_salphabeta.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py +++ b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_score_MT/test_score_MT.py b/tests/test_score_MT/test_score_MT.py index a944771f3b..dae86d418c 100644 --- a/tests/test_score_MT/test_score_MT.py +++ b/tests/test_score_MT/test_score_MT.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -23,10 +22,10 @@ class ScoreMTTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreMTTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreMTTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_absorption/test_score_absorption.py b/tests/test_score_absorption/test_score_absorption.py index 7547b1e4ed..c7e3e130df 100644 --- a/tests/test_score_absorption/test_score_absorption.py +++ b/tests/test_score_absorption/test_score_absorption.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreAbsorptionTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreAbsorptionTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreAbsorptionTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_current/test_score_current.py b/tests/test_score_current/test_score_current.py index 87a3226b0b..99c2981c2a 100644 --- a/tests/test_score_current/test_score_current.py +++ b/tests/test_score_current/test_score_current.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import HashedTestHarness diff --git a/tests/test_score_events/test_score_events.py b/tests/test_score_events/test_score_events.py index 5d861f4509..dce944592e 100644 --- a/tests/test_score_events/test_score_events.py +++ b/tests/test_score_events/test_score_events.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -19,10 +18,10 @@ class ScoreEventsTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreEventsTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreEventsTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_fission/test_score_fission.py b/tests/test_score_fission/test_score_fission.py index 4dc76fc0c0..4026c0cabf 100644 --- a/tests/test_score_fission/test_score_fission.py +++ b/tests/test_score_fission/test_score_fission.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreFissionTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreFissionTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreFissionTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_flux/test_score_flux.py b/tests/test_score_flux/test_score_flux.py index f5f7351727..1eea55f45f 100644 --- a/tests/test_score_flux/test_score_flux.py +++ b/tests/test_score_flux/test_score_flux.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreFluxTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreFluxTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreFluxTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_flux_yn/test_score_flux_yn.py b/tests/test_score_flux_yn/test_score_flux_yn.py index 2095fc9b15..254069226c 100755 --- a/tests/test_score_flux_yn/test_score_flux_yn.py +++ b/tests/test_score_flux_yn/test_score_flux_yn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -21,10 +20,10 @@ class ScoreFluxYnTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreFluxYnTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreFluxYnTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_kappafission/test_score_kappafission.py b/tests/test_score_kappafission/test_score_kappafission.py index c9fc1bfe04..2e93b51c46 100644 --- a/tests/test_score_kappafission/test_score_kappafission.py +++ b/tests/test_score_kappafission/test_score_kappafission.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreKappaFissionTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreKappaFissionTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreKappaFissionTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_nufission/test_score_nufission.py b/tests/test_score_nufission/test_score_nufission.py index 800200725f..3d540daac7 100644 --- a/tests/test_score_nufission/test_score_nufission.py +++ b/tests/test_score_nufission/test_score_nufission.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreNuFissionTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreNuFissionTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreNuFissionTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py index d13ded507c..6f33181265 100644 --- a/tests/test_score_nuscatter/test_score_nuscatter.py +++ b/tests/test_score_nuscatter/test_score_nuscatter.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -25,7 +24,7 @@ class ScoreNuScatterTestHarness(PyAPITestHarness): self._input_set.export() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreNuScatterTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py index c675bc7be3..40029bd02c 100644 --- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py +++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -29,7 +28,7 @@ class ScoreNuScatterNTestHarness(PyAPITestHarness): self._input_set.export() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreNuScatterNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py index d3a4a55961..6a69fe054d 100644 --- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py +++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -33,7 +32,7 @@ class ScoreNuScatterPNTestHarness(PyAPITestHarness): self._input_set.export() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreNuScatterPNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py index d48df6a21e..6a6ad54956 100644 --- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py +++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -29,7 +28,7 @@ class ScoreNuScatterYNTestHarness(PyAPITestHarness): self._input_set.export() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreNuScatterYNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_scatter/test_score_scatter.py b/tests/test_score_scatter/test_score_scatter.py index b6396ff3ef..0b2621acd3 100644 --- a/tests/test_score_scatter/test_score_scatter.py +++ b/tests/test_score_scatter/test_score_scatter.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreScatterTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreScatterTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreScatterTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_scatter_n/test_score_scatter_n.py b/tests/test_score_scatter_n/test_score_scatter_n.py index 341b687c5f..47fd12b2ed 100644 --- a/tests/test_score_scatter_n/test_score_scatter_n.py +++ b/tests/test_score_scatter_n/test_score_scatter_n.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -21,10 +20,10 @@ class ScoreScatterNTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(t) - PyAPITestHarness._build_inputs(self) + super(ScoreScatterNTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreScatterNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_scatter_pn/test_score_scatter_pn.py b/tests/test_score_scatter_pn/test_score_scatter_pn.py index 6fb304ac53..9186fe5480 100644 --- a/tests/test_score_scatter_pn/test_score_scatter_pn.py +++ b/tests/test_score_scatter_pn/test_score_scatter_pn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -26,10 +25,10 @@ class ScoreScatterPNTestHarness(PyAPITestHarness): self._input_set.tallies.add_tally(t1) self._input_set.tallies.add_tally(t2) - PyAPITestHarness._build_inputs(self) + super(ScoreScatterPNTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreScatterPNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_scatter_yn/test_score_scatter_yn.py b/tests/test_score_scatter_yn/test_score_scatter_yn.py index 7d572b2abb..9e6900031f 100644 --- a/tests/test_score_scatter_yn/test_score_scatter_yn.py +++ b/tests/test_score_scatter_yn/test_score_scatter_yn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -22,10 +21,10 @@ class ScoreScatterYNTestHarness(PyAPITestHarness): self._input_set.tallies.add_tally(t1) self._input_set.tallies.add_tally(t2) - PyAPITestHarness._build_inputs(self) + super(ScoreScatterYNTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreScatterYNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_total/test_score_total.py b/tests/test_score_total/test_score_total.py index c5e4294155..c6f3f335fc 100644 --- a/tests/test_score_total/test_score_total.py +++ b/tests/test_score_total/test_score_total.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -20,10 +19,10 @@ class ScoreTotalTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreTotalTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreTotalTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_score_total_yn/test_score_total_yn.py b/tests/test_score_total_yn/test_score_total_yn.py index a1ca6715cb..80f947f920 100644 --- a/tests/test_score_total_yn/test_score_total_yn.py +++ b/tests/test_score_total_yn/test_score_total_yn.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness, PyAPITestHarness import openmc @@ -23,10 +22,10 @@ class ScoreTotalYNTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() [self._input_set.tallies.add_tally(t) for t in tallies] - PyAPITestHarness._build_inputs(self) + super(ScoreTotalYNTestHarness, self)._build_inputs() def _cleanup(self): - PyAPITestHarness._cleanup(self) + super(ScoreTotalYNTestHarness, self)._cleanup() f = os.path.join(os.getcwd(), 'tallies.xml') if os.path.exists(f): os.remove(f) diff --git a/tests/test_seed/test_seed.py b/tests/test_seed/test_seed.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_seed/test_seed.py +++ b/tests/test_seed/test_seed.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_source_angle_mono/test_source_angle_mono.py b/tests/test_source_angle_mono/test_source_angle_mono.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_source_angle_mono/test_source_angle_mono.py +++ b/tests/test_source_angle_mono/test_source_angle_mono.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_source_energy_maxwell/test_source_energy_maxwell.py b/tests/test_source_energy_maxwell/test_source_energy_maxwell.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_source_energy_maxwell/test_source_energy_maxwell.py +++ b/tests/test_source_energy_maxwell/test_source_energy_maxwell.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_source_energy_mono/test_source_energy_mono.py b/tests/test_source_energy_mono/test_source_energy_mono.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_source_energy_mono/test_source_energy_mono.py +++ b/tests/test_source_energy_mono/test_source_energy_mono.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_source_file/test_source_file.py b/tests/test_source_file/test_source_file.py index 5420d71e82..6f76438c2a 100644 --- a/tests/test_source_file/test_source_file.py +++ b/tests/test_source_file/test_source_file.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import * diff --git a/tests/test_source_point/test_source_point.py b/tests/test_source_point/test_source_point.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_source_point/test_source_point.py +++ b/tests/test_source_point/test_source_point.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py index eb3136754c..5db0541344 100644 --- a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py +++ b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness from openmc.statepoint import StatePoint diff --git a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py index eb3136754c..5db0541344 100644 --- a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py +++ b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness from openmc.statepoint import StatePoint diff --git a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py index 245eede759..724a88fa65 100644 --- a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py +++ b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_sourcepoint_restart/test_sourcepoint_restart.py b/tests/test_sourcepoint_restart/test_sourcepoint_restart.py index 67227ca324..ed6addec45 100644 --- a/tests/test_sourcepoint_restart/test_sourcepoint_restart.py +++ b/tests/test_sourcepoint_restart/test_sourcepoint_restart.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_statepoint_batch/test_statepoint_batch.py b/tests/test_statepoint_batch/test_statepoint_batch.py index 8a0ef83d27..e1dc167ffd 100644 --- a/tests/test_statepoint_batch/test_statepoint_batch.py +++ b/tests/test_statepoint_batch/test_statepoint_batch.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_statepoint_interval/test_statepoint_interval.py b/tests/test_statepoint_interval/test_statepoint_interval.py index 47db80f656..e7a42cdbe7 100644 --- a/tests/test_statepoint_interval/test_statepoint_interval.py +++ b/tests/test_statepoint_interval/test_statepoint_interval.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_statepoint_restart/test_statepoint_restart.py b/tests/test_statepoint_restart/test_statepoint_restart.py index 91c316f6a5..59b77a8213 100644 --- a/tests/test_statepoint_restart/test_statepoint_restart.py +++ b/tests/test_statepoint_restart/test_statepoint_restart.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness from openmc.statepoint import StatePoint from openmc.executor import Executor diff --git a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py index 70ba94838f..00ded42ec2 100644 --- a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py +++ b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py @@ -4,7 +4,6 @@ import glob import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_survival_biasing/test_survival_biasing.py b/tests/test_survival_biasing/test_survival_biasing.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_survival_biasing/test_survival_biasing.py +++ b/tests/test_survival_biasing/test_survival_biasing.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_tally_assumesep/test_tally_assumesep.py b/tests/test_tally_assumesep/test_tally_assumesep.py index 67227ca324..ed6addec45 100644 --- a/tests/test_tally_assumesep/test_tally_assumesep.py +++ b/tests/test_tally_assumesep/test_tally_assumesep.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_tally_nuclides/test_tally_nuclides.py b/tests/test_tally_nuclides/test_tally_nuclides.py index 67227ca324..ed6addec45 100644 --- a/tests/test_tally_nuclides/test_tally_nuclides.py +++ b/tests/test_tally_nuclides/test_tally_nuclides.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_trace/test_trace.py b/tests/test_trace/test_trace.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_trace/test_trace.py +++ b/tests/test_trace/test_trace.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_track_output/test_track_output.py b/tests/test_track_output/test_track_output.py index 7039120a41..c19d39e0a6 100644 --- a/tests/test_track_output/test_track_output.py +++ b/tests/test_track_output/test_track_output.py @@ -5,7 +5,6 @@ import os import shutil import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_translation/test_translation.py b/tests/test_translation/test_translation.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_translation/test_translation.py +++ b/tests/test_translation/test_translation.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_trigger_batch_interval/test_trigger_batch_interval.py b/tests/test_trigger_batch_interval/test_trigger_batch_interval.py index 18b904efb5..59b900e503 100644 --- a/tests/test_trigger_batch_interval/test_trigger_batch_interval.py +++ b/tests/test_trigger_batch_interval/test_trigger_batch_interval.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py b/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py index 983f941d93..f9cb68d627 100644 --- a/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py +++ b/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_trigger_no_status/test_trigger_no_status.py b/tests/test_trigger_no_status/test_trigger_no_status.py index 67227ca324..ed6addec45 100644 --- a/tests/test_trigger_no_status/test_trigger_no_status.py +++ b/tests/test_trigger_no_status/test_trigger_no_status.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_trigger_tallies/test_trigger_tallies.py b/tests/test_trigger_tallies/test_trigger_tallies.py index 812e2c5e50..a0b2119dea 100644 --- a/tests/test_trigger_tallies/test_trigger_tallies.py +++ b/tests/test_trigger_tallies/test_trigger_tallies.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_uniform_fs/test_uniform_fs.py b/tests/test_uniform_fs/test_uniform_fs.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_uniform_fs/test_uniform_fs.py +++ b/tests/test_uniform_fs/test_uniform_fs.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_union_energy_grids/test_union_energy_grids.py b/tests/test_union_energy_grids/test_union_energy_grids.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_union_energy_grids/test_union_energy_grids.py +++ b/tests/test_union_energy_grids/test_union_energy_grids.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_universe/test_universe.py b/tests/test_universe/test_universe.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_universe/test_universe.py +++ b/tests/test_universe/test_universe.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/test_void/test_void.py b/tests/test_void/test_void.py index 835bf91c7b..2a595f3e66 100644 --- a/tests/test_void/test_void.py +++ b/tests/test_void/test_void.py @@ -3,7 +3,6 @@ import os import sys sys.path.insert(0, os.pardir) -sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from testing_harness import TestHarness diff --git a/tests/testing_harness.py b/tests/testing_harness.py index ff13e580cf..828fc3a094 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -11,8 +11,8 @@ import sys import numpy as np +sys.path.insert(0, os.path.join(os.pardir, os.pardir)) from input_set import InputSet -sys.path.insert(0, '../..') from openmc.statepoint import StatePoint from openmc.executor import Executor import openmc.particle_restart as pr