diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-02-12 13:54:50 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-02-12 13:54:50 -0700 |
| commit | 754f54037aca0f604b8b57ab71b30dad5e5066cf (patch) | |
| tree | 0c849988ab451b74088713daa53b7a73190426b1 /tools/run-centos | |
| parent | a1ca220d137cf7b3f79b516980a042ec800a8d91 (diff) | |
| download | vyos-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 'tools/run-centos')
| -rwxr-xr-x | tools/run-centos | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/run-centos b/tools/run-centos index 6ac6c11f..cb241ee5 100755 --- a/tools/run-centos +++ b/tools/run-centos @@ -313,7 +313,8 @@ main() { if [ -n "$unittest" ]; then debug 1 "running unit tests." - inside_as_cd "$name" "$user" "$cdir" nosetests tests/unittests || + inside_as_cd "$name" "$user" "$cdir" \ + nosetests tests/unittests cloudinit || { errorrc "nosetests failed."; errors=$(($errors+1)); } fi |