Skip to content

Commit

Permalink
Change readme and travis for tests run by pytest
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallmcdonnell committed Aug 1, 2019
1 parent 81f2a56 commit c63fecf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ script:
- xvfb-run --server-args="-screen 0 640x480x24" --auto-servernum mantidworkbench -q -x workbenchshutdown.py

# run addie tests
- xvfb-run --server-args="-screen 0 640x480x24" --auto-servernum python setup.py test
- xvfb-run --server-args="-screen 0 640x480x24" --auto-servernum pytest tests
- xvfb-run --server-args="-screen 0 640x480x24" --auto-servernum addie --version

deploy:
Expand Down
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,10 @@ Similarly, there is a script for windows (experimental)
addiedevel.bat
```

The test suite can be run using [unittests](https://docs.python.org/3/library/unittest.html) `discover` mode on the `tests` module
The test suite can be run using [pytest](https://docs.pytest.org/en/latest/)
with the [pytest-qt](https://pytest-qt.readthedocs.io/en/latest/) plugin.
```bash
$ python -m unittest discover
```
or through the `setup.py` script
```bash
$ python setup.py test
```
Individual test files can be run directly as
```bash
$ python tests/test_fileio.py
$ pytest tests
```


Expand Down

0 comments on commit c63fecf

Please sign in to comment.