diff --git a/.github/workflows/test-saltproc.yml b/.github/workflows/test-saltproc.yml index e0f27dee7..f2dad9c8c 100644 --- a/.github/workflows/test-saltproc.yml +++ b/.github/workflows/test-saltproc.yml @@ -14,7 +14,7 @@ on: workflow_dispatch: env: - CACHE_NUMBER: 0 #change to manually reset cache + CACHE_NUMBER: 1 #change to manually reset cache jobs: test-saltproc: @@ -94,7 +94,10 @@ jobs: - name: Install SaltProc run: pip install . - - name: Test SaltProc + - name: Environment variables run: | echo "OPENMC_CROSS_SECTIONS=$HOME/endfb71_hdf5/cross_sections.xml" >> $GITHUB_ENV - pytest --ignore tests/integration_tests/run_no_reprocessing --ignore tests/integration_tests/run_constant_reprocessing tests/ + + - name: Test SaltProc + run: | + pytest --ignore tests/integration_tests/run_no_reprocessing_serpent --ignore tests/integration_tests/run_no_reprocessing_openmc --ignore tests/integration_tests/run_constant_reprocessing_serpent --ignore tests/integration_tests/run_constant_reprocessing_openmc tests/ diff --git a/scripts/ci/openmc-xs.bash b/scripts/ci/openmc-xs.bash index 6c7e138b6..8193b4f1f 100755 --- a/scripts/ci/openmc-xs.bash +++ b/scripts/ci/openmc-xs.bash @@ -2,4 +2,4 @@ set -ex wget -q -O - https://anl.box.com/shared/static/9igk353zpy8fn9ttvtrqgzvw1vtejoz6.xz | tar -C $HOME -xJ - +mv $HOME/endfb-vii.1-hdf5 $HOME/endfb71_hdf5 diff --git a/tests/openmc_data/saltproc_runtime_ref/summary.h5 b/tests/openmc_data/saltproc_runtime_ref/summary.h5 new file mode 100644 index 000000000..9bba40cfd Binary files /dev/null and b/tests/openmc_data/saltproc_runtime_ref/summary.h5 differ diff --git a/tests/unit_tests/test_openmc_depcode.py b/tests/unit_tests/test_openmc_depcode.py index 560a8954b..bc25104c2 100644 --- a/tests/unit_tests/test_openmc_depcode.py +++ b/tests/unit_tests/test_openmc_depcode.py @@ -16,8 +16,6 @@ def test_read_step_metadata(openmc_depcode): assert openmc_depcode.step_metadata['depcode_input_filename'] == '' assert openmc_depcode.step_metadata['depcode_working_dir'] == \ '/home/ooblack/projects/saltproc/tests/openmc_data/saltproc_runtime_ref' - assert openmc_depcode.step_metadata['xs_data_path'] == \ - '/home/ooblack/projects/cross-section-libraries/endfb71_hdf5/cross_sections.xml' assert openmc_depcode.step_metadata['MPI_tasks'] == -1 assert openmc_depcode.step_metadata['OMP_threads'] == -1 assert openmc_depcode.step_metadata['memory_optimization_mode'] == -1