diff options
| author | Conrad Hoffmann <1226676+bitfehler@users.noreply.github.com> | 2020-01-08 15:18:48 +0100 |
|---|---|---|
| committer | Daniel Watkins <oddbloke@ubuntu.com> | 2020-01-08 09:18:48 -0500 |
| commit | c5a7d7979c036f6dc6823f429c6b6820f7f74241 (patch) | |
| tree | 036e989adddfc3d4a730443b3e3648b13ad7d078 /cloudinit/tests | |
| parent | 3b27d5319d219a7f90aa86725407931dc077dec2 (diff) | |
| download | vyos-cloud-init-c5a7d7979c036f6dc6823f429c6b6820f7f74241.tar.gz vyos-cloud-init-c5a7d7979c036f6dc6823f429c6b6820f7f74241.zip | |
Make tests work with Python 3.8 (#139)
* Make DistroChecker test work with Python 3.8
In Python 3.8, `platform.linux_distribution` has been removed. This was
anticipated, and the cloud-init code uses its own
`util.get_linux_distro` instead, which works fine w/o
`platform.linux_distribution`. However, these tests still try to mock
the platform function, which fails if it doesn't exist (Python 3.8).
Instead, mock the new function here, as this is a test for code that
depends on it rather than the function itself.
* Make GetLinuxDistro tests work with Python 3.8
In Python 3.8, `platform.dist` was removed, so allow mock to create the
function by setting `create=True`.
* Make linter happy in Python 3.8
Suppress E1101(no-member) as this function was removed.
Diffstat (limited to 'cloudinit/tests')
| -rw-r--r-- | cloudinit/tests/test_util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/tests/test_util.py b/cloudinit/tests/test_util.py index 64ed82ea..be100646 100644 --- a/cloudinit/tests/test_util.py +++ b/cloudinit/tests/test_util.py @@ -523,7 +523,7 @@ class TestGetLinuxDistro(CiTestCase): self.assertEqual( ('opensuse-tumbleweed', '20180920', platform.machine()), dist) - @mock.patch('platform.dist') + @mock.patch('platform.dist', create=True) def test_get_linux_distro_no_data(self, m_platform_dist, m_path_exists): """Verify we get no information if os-release does not exist""" m_platform_dist.return_value = ('', '', '') @@ -531,7 +531,7 @@ class TestGetLinuxDistro(CiTestCase): dist = util.get_linux_distro() self.assertEqual(('', '', ''), dist) - @mock.patch('platform.dist') + @mock.patch('platform.dist', create=True) def test_get_linux_distro_no_impl(self, m_platform_dist, m_path_exists): """Verify we get an empty tuple when no information exists and Exceptions are not propagated""" @@ -540,7 +540,7 @@ class TestGetLinuxDistro(CiTestCase): dist = util.get_linux_distro() self.assertEqual(('', '', ''), dist) - @mock.patch('platform.dist') + @mock.patch('platform.dist', create=True) def test_get_linux_distro_plat_data(self, m_platform_dist, m_path_exists): """Verify we get the correct platform information""" m_platform_dist.return_value = ('foo', '1.1', 'aarch64') |