summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2016-07-28 16:16:16 -0700
committerDylan Baker <dylan@pnwbakers.com>2016-08-05 10:45:03 -0700
commit2cc21342038fb1feacd41e0c581492ba9121613f (patch)
tree6e5524a642cab73cd392a23d61498f076556f674 /tox.ini
parent2a711954687ad0e7b784716d0f5dc04a5653efa7 (diff)
unittests: port base_tests to pytest
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 3f73add06..7bc9430f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,7 @@ deps =
pytest-pythonpath
pytest-raises
pytest-warnings
+ pytest-timeout
py{27,33,34}: mako==0.8.0
six==1.5.2
wrapt