From cdc0d2192d6ec17306495c71406e54b8ae72c019 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 22 Jun 2016 18:07:19 -0700 Subject: unittests: Port generator tests to pytest. This port uses a lot less code, is much simpler, and is able to mark tests as slow or very_slow (which is unfortunately necessary). Signed-off-by: Dylan Baker --- tox.ini | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d6a845ffd..24e48edeb 100644 --- a/tox.ini +++ b/tox.ini @@ -2,24 +2,30 @@ envlist = py{27,33,34,35}-{generator,noaccel}, py{27,33,34,35}-accel-{win,nix} skipsdist = True +[pytest] +python_paths = framework/ generated_tests/ + [testenv] passenv=HOME setenv = USERNAME = foo deps = - nose - coverage - wrapt - six==1.5.2 - accel: simplejson 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,noaccel}: mock==1.0.1 py27-accel-nix: backports.lzma py27-accel-nix: subprocess32 - py{27,33,34}: mako==0.8.0 py35: mako==1.0.2 - generator: numpy==1.7.0 + py{27,33,34}: mako==0.8.0 + six==1.5.2 + wrapt + {accel,noaccel}: nose commands = {accel,noaccel}: nosetests unittests -e generators [] - generator: nosetests unittests/generators [] + generator: py.test -rw unittests/generators -- cgit v1.2.3