Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup test suite #161

Merged
merged 74 commits into from
Oct 11, 2022
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
315849e
split up the read_main_input function
yardasol Feb 21, 2022
f13237e
rename the helper function for read_main_input
yardasol Feb 21, 2022
9407d2f
split up app.run()
yardasol Feb 21, 2022
02cc71b
split up app.run()
yardasol Feb 21, 2022
ea39880
Merge branch 'master' into cleaning-exercise
yardasol Jul 26, 2022
a96216c
add back in missing content from master merge
yardasol Jul 26, 2022
fc0b0ae
move tests directory outside of the saltproc module
yardasol Jul 27, 2022
22da911
move unit tests to their own directory; move input and data files to …
yardasol Jul 27, 2022
cb5688e
split test_app into unit test and integration test components
yardasol Jul 27, 2022
eb1adce
move run to top of file
yardasol Jul 27, 2022
d8594a4
remove global variables; rename variables
yardasol Jul 27, 2022
7ff3ee4
add arguments to some of the app functions
yardasol Jul 28, 2022
7c1536e
Merge branch 'cleaning-exercise' into cleanup-tests
yardasol Jul 28, 2022
d3d56ec
reorder functions
yardasol Jul 28, 2022
019eed6
replace os.path with pathlib.Path; fix import statements
yardasol Jul 28, 2022
2679fbf
get test_app unit test working
yardasol Jul 28, 2022
c804f8c
move pytest.ini to repo base
yardasol Jul 28, 2022
ff31b67
remove tests packages from saltproc package
yardasol Jul 28, 2022
3188df9
add missing h5 files
yardasol Jul 28, 2022
3749f09
add openmc option to _create_depcode_object
yardasol Jul 28, 2022
327118b
fix _create_simulation_object function signature
yardasol Jul 28, 2022
7eb9e1d
cleanup run_no_reproc
yardasol Jul 28, 2022
56aabaa
cleanup run_no_reproc
yardasol Jul 28, 2022
9225563
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Jul 28, 2022
c42be3c
cleanup run_no_reproc
yardasol Jul 28, 2022
8f47876
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Jul 28, 2022
ac7d01e
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Jul 28, 2022
0e7e9bf
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Jul 29, 2022
a66deaa
combine 4
yardasol Jul 28, 2022
f71ecd6
patch last commit
yardasol Jul 29, 2022
1db6aac
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Jul 29, 2022
d107d88
expand test_suite scope
yardasol Jul 29, 2022
b13a08f
remove duplicate input files
yardasol Jul 29, 2022
827787f
cleanup run_constant_reprocessing
yardasol Aug 1, 2022
d667372
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Aug 1, 2022
0abb5b2
cleanup run_constant_reprocessing
yardasol Aug 1, 2022
34bb854
rename some files in run_no_reprocessing for consistency
yardasol Aug 1, 2022
e98b3ba
make input file and reference data file names for test suite more clear
yardasol Aug 8, 2022
fd65385
pass filename changes to test_app.py; pytest and import statement adj…
yardasol Aug 8, 2022
af5bc03
cleanup basic_reprocessing integration test
yardasol Aug 8, 2022
b55fc39
remove cruft from run_constant_reprocessing
yardasol Aug 8, 2022
10790a6
update openmc test files
yardasol Aug 22, 2022
ad3fd35
update serpent test files
yardasol Aug 22, 2022
3f0f190
update handling of geometry file for DepcodeOpenMC
yardasol Aug 22, 2022
b77afc9
grammar fix in error message
yardasol Aug 22, 2022
22628ea
add conftest.py file; rework test_depcode.py
yardasol Aug 22, 2022
d116d56
overhaul sparger, simulator, separator unit tests
yardasol Aug 22, 2022
fd02250
overhaul test_materialflow.py
yardasol Aug 22, 2022
a901325
cleanup fixtures
yardasol Aug 22, 2022
05a3793
add database storage integration test
yardasol Aug 23, 2022
8f3aea3
fix typo in test_input.json for run_no_reprocessing
yardasol Aug 23, 2022
0af3f9f
fix major structural conflicts
yardasol Aug 23, 2022
8ec7fa1
Merge remote-tracking branch 'upstream/master' into cleanup-tests
yardasol Aug 23, 2022
267ccc1
update test-saltproc workflow
yardasol Aug 23, 2022
f9a8ddb
fix docstrings
yardasol Aug 23, 2022
32f79bd
pep8 fixes
yardasol Aug 23, 2022
c4d1abe
fix test-saltproc workflow
yardasol Aug 23, 2022
1867e4e
update syntax in docpages
yardasol Aug 24, 2022
97af5a3
update readme
yardasol Aug 24, 2022
616348a
update release notes
yardasol Aug 24, 2022
2bbd049
fix triggering paths for test-saltproc workflow
yardasol Aug 25, 2022
c94b445
fix new syntax inconsistencies
yardasol Aug 25, 2022
ba49bca
fix new syntax inconsistencies
yardasol Aug 25, 2022
49be51f
remove cruft terminal output
yardasol Sep 13, 2022
c0bfe49
process_input_file -> process_file; path_input_file -> dot_file
yardasol Sep 13, 2022
4d849ca
Add descriptions for object fixtures
yardasol Sep 13, 2022
94e749d
remove old comments
yardasol Sep 13, 2022
bba890f
Remov cruft pytest marker
yardasol Sep 13, 2022
9b06262
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Sep 13, 2022
a1315fc
reorder function definitions to be consitent w style of software
yardasol Sep 13, 2022
3a6135a
expand testing instructions
yardasol Sep 27, 2022
c0bcedd
Merge remote-tracking branch 'origin/cleanup-tests' into cleanup-tests
yardasol Oct 4, 2022
8e2192b
fix test input file names
yardasol Oct 4, 2022
51e7a8d
remove paths to share dir is tools/ci scripts
yardasol Oct 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-saltproc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
paths:
- 'saltproc/**'
- 'saltproc/tests/**'
- 'tests/**'
pull_request:
workflow_run:
workflows: ["Cache dependencies"]
Expand Down Expand Up @@ -96,4 +96,4 @@ jobs:
- name: Test SaltProc
run: |
echo "OPENMC_CROSS_SECTIONS=$HOME/endfb71_hdf5/cross_sections.xml" >> $GITHUB_ENV
pytest --ignore saltproc/tests/integration_tests saltproc
pytest --ignore tests/integration_tests/run_no_reprocessing --ignore tests/integration_tests/run_constant_reprocessing tests/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ python saltproc -n 4 -d 1 -i examples/tap/tap_main.json
### Installation

Detailed installation instructions can be found in the
[User's Guide](https://arfc.github.io/saltproc/installation.html).
[User's Guide](https://arfc.github.io/saltproc/master/installation.html).

### Documentation

Expand Down
9 changes: 2 additions & 7 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ To run the tests, execute:

.. code-block:: bash

pytest saltproc/

from the root directory of SaltProc. If you just want to run the unit tests, execute

.. code-block:: bash

pytest --ignore saltproc/tests/integration_tests saltproc/
pytest test/

from the root directory of SaltProc.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If one wants to run just the unit tests and not the integration tests, how would they do that here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can specify the path to the test(s) you want when calling pytest. Alternatively, you can use the --ignore flag followed by the path(s) to the test(s) you don't want to test.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I think that's worth explicitly stating here for people who may want to run unit tests locally when doing development. Can you please add it back in with the updated paths?

4 changes: 2 additions & 2 deletions doc/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ Molten Salt Reactors. It performs following major functions:

The code logic flow is the following:

1. Runs the transport-depletion code (`saltproc.depcode.run_depcode()`)
1. Runs the transport-depletion code (:meth:`saltproc.depcode.Depcode.run_depcode()`)
2. Parses through the output `*_dep.m` file and creates PyNE Material object
for each burnable material.
3. Processes Fuel (`saltproc.app.reprocessing()` and `saltproc.refill`):
3. Processes Fuel (:meth:`saltproc.app.reprocess_materials()` and :meth:`saltproc.app.refill_materials()`):

* Passes fuel composition throughout Processes objects (reprocessing system
components) to remove poisons with specific efficiency.
Expand Down
1 change: 1 addition & 0 deletions doc/releasenotes/v0.5.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ Python API Changes
..
Describe any changes to the API

- The test suite has been overhauled and moved to the `tests/` directory. The test suite is no longer part of the `saltproc` package.
samgdotson marked this conversation as resolved.
Show resolved Hide resolved
munkm marked this conversation as resolved.
Show resolved Hide resolved

- Input file format changes:

Expand Down
1 change: 1 addition & 0 deletions saltproc/pytest.ini → pytest.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[pytest]
python_files = test*.py
munkm marked this conversation as resolved.
Show resolved Hide resolved
filterwarnings =
error
ignore::Warning
Loading