summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Smith <chad.smith@canonical.com>2018-09-27 21:02:28 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2018-09-27 21:02:28 +0000
commitfb5015fe3f5078149463838b7974523646f94eab (patch)
treeacb910c1159a6f51818bc628a350ec9151295977
parentfacb92c5b55f4d27ee971eaf49c580fbf92ac2c3 (diff)
downloadvyos-cloud-init-fb5015fe3f5078149463838b7974523646f94eab.tar.gz
vyos-cloud-init-fb5015fe3f5078149463838b7974523646f94eab.zip
cii-tests: use unittest2.SkipTest in ntp_chrony due to new deps
Git commitish fc4b966ba928b30b1c586407e752e0b51b1031e8 changed integration test dependencies from unittest to unittest2. Use unittest2.SkipTest in test_chrony to avoid causing tracebacks.
-rw-r--r--tests/cloud_tests/testcases/modules/ntp_chrony.py4
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 7d341773..0f4c3d08 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 unittest
+import unittest2
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 unittest.SkipTest(
+ raise unittest2.SkipTest(
'No support for chrony on containers <= artful.'
' LP: #1589780')
return super(TestNtpChrony, self).setUp()