From c63fecfc6bfe31972f52507b13514aa4f479034d Mon Sep 17 00:00:00 2001 From: Marshall McDonnell Date: Thu, 1 Aug 2019 07:43:40 -0400 Subject: [PATCH] Change readme and travis for tests run by pytest --- .travis.yml | 2 +- README.md | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index db2ff450..17884b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/README.md b/README.md index 0127bbf3..ad104fa4 100644 --- a/README.md +++ b/README.md @@ -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 ```