diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-03-04 18:21:59 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-03-04 18:21:59 +0000 |
| commit | edf052c3196139169ecbfe98049c278f4babc8ca (patch) | |
| tree | ab2221815bfce6b5f30ff9ee05f0e760c3eb54fb /tests/unittests/test_datasource/test_azure.py | |
| parent | eee0e09ead3d11c32e8888d13d164810ee5f19d6 (diff) | |
| download | vyos-cloud-init-edf052c3196139169ecbfe98049c278f4babc8ca.tar.gz vyos-cloud-init-edf052c3196139169ecbfe98049c278f4babc8ca.zip | |
drop Python 2.6 support and our NIH version detection
- Remove the last few places that use `if PY26`
- Replace our Python version detection logic with six's (which we were
already using in most places)
Diffstat (limited to 'tests/unittests/test_datasource/test_azure.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_azure.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index 5edf36e8..6b05b8f1 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -11,7 +11,7 @@ from cloudinit.util import (b64e, decode_binary, load_file, write_file, from cloudinit.version import version_string as vs from cloudinit.tests.helpers import ( HttprettyTestCase, CiTestCase, populate_dir, mock, wrap_and_call, - ExitStack, PY26, SkipTest) + ExitStack) import crypt import httpretty @@ -221,8 +221,6 @@ class TestAzureDataSource(CiTestCase): def setUp(self): super(TestAzureDataSource, self).setUp() - if PY26: - raise SkipTest("Does not work on python 2.6") self.tmp = self.tmp_dir() # patch cloud_dir, so our 'seed_dir' is guaranteed empty |