summaryrefslogtreecommitdiff
path: root/tests/unittests/test_handler/test_handler_ca_certs.py
diff options
context:
space:
mode:
authorJames Falcon <james.falcon@canonical.com>2021-10-15 19:53:42 -0500
committerGitHub <noreply@github.com>2021-10-15 18:53:42 -0600
commita9501251aadf6d30192f7bd7debeabc9c3e29420 (patch)
tree209b109dd17834b35975c52d2d49a532bdd6ef13 /tests/unittests/test_handler/test_handler_ca_certs.py
parentb3e31ba228d32c318872fb68edda272f679e1004 (diff)
downloadvyos-cloud-init-a9501251aadf6d30192f7bd7debeabc9c3e29420.tar.gz
vyos-cloud-init-a9501251aadf6d30192f7bd7debeabc9c3e29420.zip
testing: add get_cloud function (SC-461) (#1038)
Also added supporting distro/datasource classes and updated tests that have a `get_cloud` call.
Diffstat (limited to 'tests/unittests/test_handler/test_handler_ca_certs.py')
-rw-r--r--tests/unittests/test_handler/test_handler_ca_certs.py33
1 files changed, 14 insertions, 19 deletions
diff --git a/tests/unittests/test_handler/test_handler_ca_certs.py b/tests/unittests/test_handler/test_handler_ca_certs.py
index 6e3831ed..2a4ab49e 100644
--- a/tests/unittests/test_handler/test_handler_ca_certs.py
+++ b/tests/unittests/test_handler/test_handler_ca_certs.py
@@ -1,20 +1,19 @@
# This file is part of cloud-init. See LICENSE file for license information.
+import logging
+import shutil
+import tempfile
+import unittest
+from contextlib import ExitStack
+from unittest import mock
-from cloudinit import cloud
from cloudinit import distros
from cloudinit.config import cc_ca_certs
from cloudinit import helpers
from cloudinit import subp
from cloudinit import util
-
from cloudinit.tests.helpers import TestCase
-import logging
-import shutil
-import tempfile
-import unittest
-from contextlib import ExitStack
-from unittest import mock
+from tests.unittests.util import get_cloud
class TestNoConfig(unittest.TestCase):
@@ -56,10 +55,6 @@ class TestConfig(TestCase):
paths = helpers.Paths({})
return cls(kind, {}, paths)
- def _get_cloud(self, kind):
- distro = self._fetch_distro(kind)
- return cloud.Cloud(None, self.paths, None, distro, None)
-
def _mock_init(self):
self.mocks = ExitStack()
self.addCleanup(self.mocks.close)
@@ -81,7 +76,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)
self.assertEqual(self.mock_add.call_count, 0)
@@ -94,7 +89,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)
self.assertEqual(self.mock_add.call_count, 0)
@@ -107,7 +102,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
conf = cc_ca_certs._distro_ca_certs_configs(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)
@@ -121,7 +116,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
conf = cc_ca_certs._distro_ca_certs_configs(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)
@@ -135,7 +130,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)
self.assertEqual(self.mock_add.call_count, 0)
@@ -148,7 +143,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)
self.assertEqual(self.mock_add.call_count, 0)
@@ -161,7 +156,7 @@ class TestConfig(TestCase):
for distro_name in cc_ca_certs.distros:
self._mock_init()
- cloud = self._get_cloud(distro_name)
+ cloud = get_cloud(distro_name)
conf = cc_ca_certs._distro_ca_certs_configs(distro_name)
cc_ca_certs.handle(self.name, config, cloud, self.log, self.args)