Skip to content

Commit

Permalink
Merge pull request #8 from pysat/skip_remote
Browse files Browse the repository at this point in the history
TST: Update for latest pysat testing updates
  • Loading branch information
jklenzing committed Jul 23, 2020
2 parents 10b0130 + cb5cd3e commit 3e29bb9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
3 changes: 0 additions & 3 deletions .coveragerc

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ script:
- pytest -vs --cov=pysatMadrigal/ --flake8

after_success:
- coveralls
- coveralls --rcfile=setup.cfg
5 changes: 5 additions & 0 deletions pysatMadrigal/tests/test_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
mark = pytest.mark.parametrize("inst", instruments['no_download'])
getattr(InstTestClass, method).pytestmark.append(mark)

# remote_file_list not functional in current code. Disabling for now
if 'test_remote_file_list' in method_list:
mark = pytest.mark.skip(reason="not currently implemented")
getattr(InstTestClass, 'test_remote_file_list').pytestmark.append(mark)


class TestInstruments(InstTestClass):

Expand Down
4 changes: 4 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[coverage:report]
omit =
*/instruments/templates/

[tool:pytest]
markers =
all_inst: tests all instruments
Expand Down

0 comments on commit 3e29bb9

Please sign in to comment.