summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2016-07-01 13:13:59 -0700
committerDylan Baker <dylan@pnwbakers.com>2016-08-05 10:45:02 -0700
commit24768559c45d2a7dcd38ccff7abf6de513d7cee8 (patch)
tree1a96878a241bb126bc4feae6df18f8dc08d94319 /tox.ini
parentb24f9429ea4521c0df91dbef8da2a9ee55f50a51 (diff)
unittests: port status module tests to py.test
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 6 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 24e48edeb..908a5b11f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,19 +13,20 @@ deps =
accel-nix: lxml
accel: simplejson
generator: numpy==1.7.0
- generator: pytest
- generator: pytest-pythonpath
- generator: pytest-raises
- generator: pytest-warnings
mock==1.0.1
py27-accel-nix,py{33,34,35}-{accel,noaccel}: psutil
py27-accel-nix: backports.lzma
py27-accel-nix: subprocess32
py35: mako==1.0.2
+ pytest
+ pytest-pythonpath
+ pytest-raises
+ pytest-warnings
py{27,33,34}: mako==0.8.0
six==1.5.2
wrapt
{accel,noaccel}: nose
commands =
- {accel,noaccel}: nosetests unittests -e generators []
+ {accel,noaccel}: nosetests unittests -e generators -e framework []
+ {accel,noaccel}: py.test -rw unittests/framework
generator: py.test -rw unittests/generators