diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-03-28 12:29:04 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-03-28 12:29:04 -0600 |
| commit | cf3eaed2e01062f9b5d47042d7a76b092970e0cf (patch) | |
| tree | 53f7c52c5a76bb586da0483699fd6d188e72f457 /cloudinit/cmd/tests/test_status.py | |
| parent | 9f159f3a55a7bba7868e03d9cccd898678381f03 (diff) | |
| parent | 8caa3bcf8f2c5b3a448b9d892d4cf53ed8db9be9 (diff) | |
| download | vyos-cloud-init-cf3eaed2e01062f9b5d47042d7a76b092970e0cf.tar.gz vyos-cloud-init-cf3eaed2e01062f9b5d47042d7a76b092970e0cf.zip | |
merge from master at 18.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 |