summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-02-12 13:54:50 -0700
committerChad Smith <chad.smith@canonical.com>2018-02-12 13:54:50 -0700
commit754f54037aca0f604b8b57ab71b30dad5e5066cf (patch)
tree0c849988ab451b74088713daa53b7a73190426b1 /tox.ini
parenta1ca220d137cf7b3f79b516980a042ec800a8d91 (diff)
downloadvyos-cloud-init-754f54037aca0f604b8b57ab71b30dad5e5066cf.tar.gz
vyos-cloud-init-754f54037aca0f604b8b57ab71b30dad5e5066cf.zip
tests: run nosetests in cloudinit/ directory, fix py26 fallout.
When we moved some tests to live under cloudinit/ we inadvertantly failed to change all things that would run nose to include that directory. This changes all the 'nose' invocations to consistently run with tests/unittests and cloudinit/. Also, it works around, more correctly this time, a python2.6-ism with the following code: with assertRaises(SystemExit) as cm: sys.exit(2)
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index bb74853f..1f990af4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ deps = -r{toxinidir}/test-requirements.txt
[testenv:py26]
deps = -r{toxinidir}/test-requirements.txt
-commands = nosetests {posargs:tests/unittests}
+commands = nosetests {posargs:tests/unittests cloudinit}
setenv =
LC_ALL = C
@@ -83,7 +83,7 @@ deps =
[testenv:centos6]
basepython = python2.6
-commands = nosetests {posargs:tests/unittests}
+commands = nosetests {posargs:tests/unittests cloudinit}
deps =
# requirements
argparse==1.2.1
@@ -98,7 +98,7 @@ deps =
[testenv:opensusel42]
basepython = python2.7
-commands = nosetests {posargs:tests/unittests}
+commands = nosetests {posargs:tests/unittests cloudinit}
deps =
# requirements
argparse==1.3.0