Fix `unit tests`

Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>

coriolis/tests/osmorphing/test_base.py

@@ -713,7 +713,8 @@ class BaseLinuxOSMorphingToolsTestBase(test_base.CoriolisBaseTestCase):
             ["vim"],
             {},
             False,
-            None
+            None,
+            False
         ),
         (
             ["cloud-init"],
@@ -724,16 +725,21 @@ class BaseLinuxOSMorphingToolsTestBase(test_base.CoriolisBaseTestCase):
                 "ssh_pwauth": True,
                 "users": None,
                 "network": {"config": "disabled"},
-            }
+            },
+            True
         ),
         (
             ["cloud-init", "vim"],
             {"retain_user_credentials": False, "set_dhcp": True},
             True,
-            {}
+            {},
+            False
         ),
     )
     @ddt.unpack
+    @mock.patch.object(base.BaseLinuxOSMorphingTools,
+                       '_enable_systemd_service')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_has_systemd_chroot')
     @mock.patch.object(base.BaseLinuxOSMorphingTools,
                        '_write_cloud_init_mods_config')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_create_cloudinit_user')
@@ -745,12 +751,15 @@ class BaseLinuxOSMorphingToolsTestBase(test_base.CoriolisBaseTestCase):
     @mock.patch.object(base.BaseLinuxOSMorphingTools, 'get_packages')
     def test__configure_cloud_init(
             self, returned_packages, osmorphing_params, creates_cloudinit_user,
-            expected_result, mock_get_packages,
+            expected_result, has_systemd_chroot, mock_get_packages,
             mock__disable_installer_cloud_config,
             mock__ensure_cloud_init_not_disabled, mock__reset_cloud_init_run,
-            mock__create_cloudinit_user, mock__write_cloud_init_mods_config):
+            mock__create_cloudinit_user, mock__write_cloud_init_mods_config,
+            mock__has_systemd_chroot, mock__enable_systemd_service
+    ):
         mock_get_packages.return_value = returned_packages
         self.os_morphing_tools._osmorphing_parameters = osmorphing_params
+        mock__has_systemd_chroot.return_value = has_systemd_chroot
 
         self.os_morphing_tools._configure_cloud_init()
 
@@ -763,6 +772,11 @@ class BaseLinuxOSMorphingToolsTestBase(test_base.CoriolisBaseTestCase):
                 mock__create_cloudinit_user.assert_called_once()
             else:
                 mock__create_cloudinit_user.assert_not_called()
+            if has_systemd_chroot:
+                mock__enable_systemd_service.assert_called_once_with(
+                    "cloud-init")
+            else:
+                mock__enable_systemd_service.assert_not_called()
         else:
             mock__disable_installer_cloud_config.assert_not_called()
 

coriolis/tests/osmorphing/test_debian.py

@@ -213,17 +213,6 @@ class BaseDebianMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         mock_disable_predictable_nic_names.assert_not_called()
         mock_write_file_sudo.assert_not_called()
 
-    @mock.patch.object(debian.BaseDebianMorphingTools,
-                       '_enable_systemd_service')
-    @mock.patch.object(debian.BaseDebianMorphingTools, '_has_systemd_chroot')
-    def test__configure_cloud_init(
-            self, mock__has_systemd_chroot, mock__enable_systemd_service):
-        mock__has_systemd_chroot.return_value = True
-
-        self.morpher._configure_cloud_init()
-
-        mock__enable_systemd_service.assert_called_once_with("cloud-init")
-
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
     def test_get_installed_packages(self, mock_exec_cmd_chroot):
         mock_exec_cmd_chroot.return_value = \

coriolis/tests/osmorphing/test_redhat.py

@@ -483,17 +483,6 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         mock_write_config_file.assert_called_once_with(
             "etc/sysconfig/network", mock_read_config_file.return_value)
 
-    @mock.patch.object(redhat.BaseRedHatMorphingTools,
-                       '_enable_systemd_service')
-    @mock.patch.object(redhat.BaseRedHatMorphingTools, '_has_systemd')
-    def test__configure_cloud_init(
-            self, mock__has_systemd, mock__enable_systemd_service):
-        mock__has_systemd.return_value = True
-
-        self.morphing_tools._configure_cloud_init()
-
-        mock__enable_systemd_service.assert_called_once_with("cloud-init")
-
     @mock.patch.object(
         redhat.BaseRedHatMorphingTools, '_get_config_file_content'
     )

coriolis/tests/osmorphing/test_suse.py

@@ -226,16 +226,6 @@ class BaseSUSEMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
 
         self.assertFalse(result)
 
-    @mock.patch.object(suse.BaseSUSEMorphingTools, '_enable_systemd_service')
-    @mock.patch.object(suse.BaseSUSEMorphingTools, '_has_systemd')
-    def test__configure_cloud_init(
-            self, mock__has_systemd, mock__enable_systemd_service):
-        mock__has_systemd.return_value = True
-
-        self.morphing_tools._configure_cloud_init()
-
-        mock__enable_systemd_service.assert_called_once_with("cloud-init")
-
     @mock.patch.object(suse.BaseSUSEMorphingTools, '_configure_cloud_init')
     @mock.patch.object(suse.BaseSUSEMorphingTools, '_run_dracut')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, 'post_packages_install')