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 /cloudinit/cmd/tests/test_status.py | |
| 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 'cloudinit/cmd/tests/test_status.py')
| -rw-r--r-- | cloudinit/cmd/tests/test_status.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/cmd/tests/test_status.py b/cloudinit/cmd/tests/test_status.py index 4a5a8c06..37a89936 100644 --- a/cloudinit/cmd/tests/test_status.py +++ b/cloudinit/cmd/tests/test_status.py @@ -380,10 +380,11 @@ class TestStatus(CiTestCase): wrap_and_call( 'cloudinit.cmd.status', {'sys.argv': {'new': ['status']}, + 'sys.exit': {'side_effect': self.sys_exit}, '_is_cloudinit_disabled': (False, ''), 'Init': {'side_effect': self.init_class}}, status.main) - self.assertRaisesCodeEqual(0, context_manager.exception.code) + self.assertEqual(0, context_manager.exception.code) self.assertEqual('status: running\n', m_stdout.getvalue()) # vi: ts=4 expandtab syntax=python |