summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-24 14:05:20 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-24 14:05:20 -0700
commit70ee3c4e6806996401d747e4f8b25855e85d86eb (patch)
tree5812022b2c16d356f4c55238c23a58b8b8411f80
parentf2665c246a3e6dec55064eced09919d912ae0e52 (diff)
downloadvyos-cloud-init-70ee3c4e6806996401d747e4f8b25855e85d86eb.tar.gz
vyos-cloud-init-70ee3c4e6806996401d747e4f8b25855e85d86eb.zip
Make the usage of 'nose-timer' optional
-rw-r--r--test-requirements.txt4
-rw-r--r--tox.ini4
2 files changed, 5 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 88a67a26..aa01fa88 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,9 @@
httpretty>=0.7.1
mock
nose
-nose-timer
+
+# Only needed if u want to know the test times
+# nose-timer
# Only really needed on older versions of python
contextlib2
diff --git a/tox.ini b/tox.ini
index d051f2ac..dafaaf6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = py27,py3,flake8
recreate = True
[testenv]
-commands = python -m nose --with-timer --timer-top-n 10 {posargs:tests}
+commands = python -m nose {posargs:tests}
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
@@ -19,7 +19,7 @@ setenv =
LC_ALL = en_US.utf-8
[testenv:py26]
-commands = nosetests --with-timer --timer-top-n 10 {posargs:tests}
+commands = nosetests {posargs:tests}
deps =
contextlib2
httpretty>=0.7.1