diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-04-24 09:26:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 09:26:51 -0400 |
| commit | 38a7e6e9756fdab31264c0d6e93d20432ed111ac (patch) | |
| tree | c71a79b98c883cf3657eaac6e6b2267dfb50f277 /tests/cloud_tests/testcases/modules/ntp_chrony.py | |
| parent | 7276aa5240b8cb84671a56d795d811f15dfba8e2 (diff) | |
| download | vyos-cloud-init-38a7e6e9756fdab31264c0d6e93d20432ed111ac.tar.gz vyos-cloud-init-38a7e6e9756fdab31264c0d6e93d20432ed111ac.zip | |
cloudinit: drop dependencies on unittest2 and contextlib2 (#322)
These libraries provide backports of Python 3's stdlib components to Python 2. As we only support Python 3, we can simply use the stdlib now. This pull request does the following:
* removes some unneeded compatibility code for the old spelling of `assertRaisesRegex`
* replaces invocations of the Python 2-only `assertItemsEqual` with its new name, `assertCountEqual`
* replaces all usage of `unittest2` with `unittest`
* replaces all usage of `contextlib2` with `contextlib`
* drops `unittest2` and `contextlib2` from requirements files and tox.ini
It also rewrites some `test_azure` helpers to use bare asserts. We were seeing a strange error in xenial builds of this branch which appear to be stemming from the AssertionError that pytest produces being _different_ from the standard AssertionError. This means that the modified helpers weren't behaving correctly, because they weren't catching AssertionErrors as one would expect. (I believe this is related, in some way, to https://github.com/pytest-dev/pytest/issues/645, but the only version of pytest where we're affected is so far in the past that it's not worth pursuing it any further as we have a workaround.)
Diffstat (limited to 'tests/cloud_tests/testcases/modules/ntp_chrony.py')
| -rw-r--r-- | tests/cloud_tests/testcases/modules/ntp_chrony.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/cloud_tests/testcases/modules/ntp_chrony.py b/tests/cloud_tests/testcases/modules/ntp_chrony.py index 0f4c3d08..7d341773 100644 --- a/tests/cloud_tests/testcases/modules/ntp_chrony.py +++ b/tests/cloud_tests/testcases/modules/ntp_chrony.py @@ -1,7 +1,7 @@ # This file is part of cloud-init. See LICENSE file for license information. """cloud-init Integration Test Verify Script.""" -import unittest2 +import unittest from tests.cloud_tests.testcases import base @@ -13,7 +13,7 @@ class TestNtpChrony(base.CloudTestCase): """Skip this suite of tests on lxd and artful or older.""" if self.platform == 'lxd': if self.is_distro('ubuntu') and self.os_version_cmp('artful') <= 0: - raise unittest2.SkipTest( + raise unittest.SkipTest( 'No support for chrony on containers <= artful.' ' LP: #1589780') return super(TestNtpChrony, self).setUp() |