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

Move IO tests to a separate test package on Travis. #668

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env:
matrix:
- TEST_PACKAGE="pyclaw"
- TEST_PACKAGE="petclaw"
- TEST_PACKAGE="IO"
- TEST_PACKAGE="forestclaw"

python:
Expand Down
10 changes: 9 additions & 1 deletion run_tests_on_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "${TEST_PACKAGE}" == "pyclaw" ]; then
nosetests --first-pkg-wins --with-doctest --exclude=limiters --exclude=sharpclaw --exclude=fileio --exclude=example --with-coverage --cover-package=clawpack.pyclaw;
mv .coverage .coverage.doctest;
# pyclaw examples and I/O tests
nosetests -v --first-pkg-wins --exclude=limiters --exclude=sharpclaw --with-coverage --cover-package=clawpack.pyclaw --include=IOTest;
#nosetests -v --first-pkg-wins --exclude=limiters --exclude=sharpclaw --with-coverage --cover-package=clawpack.pyclaw --include=IOTest;
cd ../../examples;
nosetests -v --with-coverage --cover-package=clawpack.pyclaw;
mv .coverage ../src/pyclaw/.coverage.examples;
Expand All @@ -30,6 +30,14 @@ if [[ "${TEST_PACKAGE}" == "petclaw" ]]; then
mpirun -n 4 nosetests -v --first-pkg-wins;
fi

if [ "${TEST_PACKAGE}" == "IO" ]; then
# pyclaw I/O tests
nosetests -v --first-pkg-wins --exclude=limiters --exclude=sharpclaw --with-coverage --cover-package=clawpack.pyclaw --include=IOTest;
#cd ../src/pyclaw;
#coverage combine;
fi


if [[ "${TEST_PACKAGE}" == "forestclaw" ]]; then
# forestclaw tests (I/O only)
cd ../forestclaw;
Expand Down
1 change: 1 addition & 0 deletions src/pyclaw/classic/solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ def setup(self,solution):

self._check_cfl_settings()

assert isinstance(self.num_waves, int), "You must set solver.num_waves before using the solver."
self._set_mthlim()
if(self.kernel_language == 'Fortran'):
if self.fmod is None:
Expand Down