diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-03-31 16:32:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 16:32:40 -0400 |
| commit | b698b349c827f30fa60de55e2469a21ae4342669 (patch) | |
| tree | 91d76d0bc508d39b4de8ee6a06a0e3dcb245cb96 /cloudinit | |
| parent | c478d0bff412c67280dfe8f08568de733f9425a1 (diff) | |
| download | vyos-cloud-init-b698b349c827f30fa60de55e2469a21ae4342669.tar.gz vyos-cloud-init-b698b349c827f30fa60de55e2469a21ae4342669.zip | |
CiTestCase: stop using and remove sys_exit helper (#283)
This shim was required to support Python 2.6, so we no longer need it.
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/cmd/tests/test_clean.py | 1 | ||||
| -rw-r--r-- | cloudinit/cmd/tests/test_status.py | 1 | ||||
| -rw-r--r-- | cloudinit/tests/helpers.py | 10 |
3 files changed, 0 insertions, 12 deletions
diff --git a/cloudinit/cmd/tests/test_clean.py b/cloudinit/cmd/tests/test_clean.py index 13a69aa1..a848a810 100644 --- a/cloudinit/cmd/tests/test_clean.py +++ b/cloudinit/cmd/tests/test_clean.py @@ -167,7 +167,6 @@ class TestClean(CiTestCase): wrap_and_call( 'cloudinit.cmd.clean', {'Init': {'side_effect': self.init_class}, - 'sys.exit': {'side_effect': self.sys_exit}, 'sys.argv': {'new': ['clean', '--logs']}}, clean.main) diff --git a/cloudinit/cmd/tests/test_status.py b/cloudinit/cmd/tests/test_status.py index 1ed10896..1c9eec37 100644 --- a/cloudinit/cmd/tests/test_status.py +++ b/cloudinit/cmd/tests/test_status.py @@ -382,7 +382,6 @@ 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) diff --git a/cloudinit/tests/helpers.py b/cloudinit/tests/helpers.py index 8d3512db..f4db5827 100644 --- a/cloudinit/tests/helpers.py +++ b/cloudinit/tests/helpers.py @@ -197,16 +197,6 @@ class CiTestCase(TestCase): dir = self.tmp_dir() return os.path.normpath(os.path.abspath(os.path.join(dir, path))) - def sys_exit(self, code): - """Provide a wrapper around sys.exit for python 2.6 - - In 2.6, this code would produce 'cm.exception' with value int(2) - rather than the SystemExit that was raised by sys.exit(2). - with assertRaises(SystemExit) as cm: - sys.exit(2) - """ - raise SystemExit(code) - def tmp_cloud(self, distro, sys_cfg=None, metadata=None): """Create a cloud with tmp working directory paths. |