testing: add get_cloud function (SC-461) (#1038)

Also added supporting distro/datasource classes and updated tests
that have a `get_cloud` call.

1 files changed, 13 insertions, 20 deletions

diff --git a/tests/unittests/test_handler/test_handler_runcmd.py b/tests/unittests/test_handler/test_handler_runcmd.py
index c03efa67..672e8093 100644
--- a/tests/unittests/test_handler/test_handler_runcmd.py
+++ b/tests/unittests/test_handler/test_handler_runcmd.py
@@ -1,16 +1,16 @@
 # This file is part of cloud-init. See LICENSE file for license information.
+import logging
+import os
+import stat
+from unittest.mock import patch
 
 from cloudinit.config.cc_runcmd import handle, schema
-from cloudinit.sources import DataSourceNone
-from cloudinit import (distros, helpers, cloud, subp, util)
+from cloudinit import (helpers, subp, util)
 from cloudinit.tests.helpers import (
     CiTestCase, FilesystemMockingTestCase, SchemaTestCaseMixin,
     skipUnlessJsonSchema)
 
-from unittest.mock import patch
-import logging
-import os
-import stat
+from tests.unittests.util import get_cloud
 
 LOG = logging.getLogger(__name__)
 
@@ -23,20 +23,13 @@ class TestRuncmd(FilesystemMockingTestCase):
         super(TestRuncmd, self).setUp()
         self.subp = subp.subp
         self.new_root = self.tmp_dir()
-
-    def _get_cloud(self, distro):
         self.patchUtils(self.new_root)
-        paths = helpers.Paths({'scripts': self.new_root})
-        cls = distros.fetch(distro)
-        mydist = cls(distro, {}, paths)
-        myds = DataSourceNone.DataSourceNone({}, mydist, paths)
-        paths.datasource = myds
-        return cloud.Cloud(myds, paths, {}, mydist, None)
+        self.paths = helpers.Paths({'scripts': self.new_root})
 
     def test_handler_skip_if_no_runcmd(self):
         """When the provided config doesn't contain runcmd, skip it."""
         cfg = {}
-        mycloud = self._get_cloud('ubuntu')
+        mycloud = get_cloud(paths=self.paths)
         handle('notimportant', cfg, mycloud, LOG, None)
         self.assertIn(
             "Skipping module named notimportant, no 'runcmd' key",
@@ -47,7 +40,7 @@ class TestRuncmd(FilesystemMockingTestCase):
         """When shellify fails throw exception"""
         cls.side_effect = TypeError("patched shellify")
         valid_config = {'runcmd': ['echo 42']}
-        cc = self._get_cloud('ubuntu')
+        cc = get_cloud(paths=self.paths)
         with self.assertRaises(TypeError) as cm:
             with self.allow_subp(['/bin/sh']):
                 handle('cc_runcmd', valid_config, cc, LOG, None)
@@ -56,7 +49,7 @@ class TestRuncmd(FilesystemMockingTestCase):
     def test_handler_invalid_command_set(self):
         """Commands which can't be converted to shell will raise errors."""
         invalid_config = {'runcmd': 1}
-        cc = self._get_cloud('ubuntu')
+        cc = get_cloud(paths=self.paths)
         with self.assertRaises(TypeError) as cm:
             handle('cc_runcmd', invalid_config, cc, LOG, [])
         self.assertIn(
@@ -72,7 +65,7 @@ class TestRuncmd(FilesystemMockingTestCase):
         invalid content.
         """
         invalid_config = {'runcmd': 1}
-        cc = self._get_cloud('ubuntu')
+        cc = get_cloud(paths=self.paths)
         with self.assertRaises(TypeError) as cm:
             handle('cc_runcmd', invalid_config, cc, LOG, [])
         self.assertIn(
@@ -89,7 +82,7 @@ class TestRuncmd(FilesystemMockingTestCase):
         """
         invalid_config = {
             'runcmd': ['ls /', 20, ['wget', 'http://stuff/blah'], {'a': 'n'}]}
-        cc = self._get_cloud('ubuntu')
+        cc = get_cloud(paths=self.paths)
         with self.assertRaises(TypeError) as cm:
             handle('cc_runcmd', invalid_config, cc, LOG, [])
         expected_warnings = [
@@ -105,7 +98,7 @@ class TestRuncmd(FilesystemMockingTestCase):
     def test_handler_write_valid_runcmd_schema_to_file(self):
         """Valid runcmd schema is written to a runcmd shell script."""
         valid_config = {'runcmd': [['ls', '/']]}
-        cc = self._get_cloud('ubuntu')
+        cc = get_cloud(paths=self.paths)
         handle('cc_runcmd', valid_config, cc, LOG, [])
         runcmd_file = os.path.join(
             self.new_root,