From 24768559c45d2a7dcd38ccff7abf6de513d7cee8 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 1 Jul 2016 13:13:59 -0700 Subject: unittests: port status module tests to py.test Signed-off-by: Dylan Baker --- tox.ini | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tox.ini') 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 -- cgit v1.2.3