Skip to content

Move SELinux autorelabeling to base classes #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mihaelabalutoiu wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Draft

Move SELinux autorelabeling to base classes #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions coriolis/osmorphing/redhat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def pre_packages_install(self, package_names):
def post_packages_install(self, package_names):
self._configure_cloud_init()
self._run_dracut()
self._set_selinux_autorelabel()
super(BaseRedHatMorphingTools, self).post_packages_install(
package_names)

Expand Down
1 change: 1 addition & 0 deletions coriolis/osmorphing/suse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def pre_packages_install(self, package_names):
def post_packages_install(self, package_names):
self._configure_cloud_init()
self._run_dracut()
self._set_selinux_autorelabel()
super(BaseSUSEMorphingTools, self).post_packages_install(package_names)

def _enable_sles_module(self, module):
Expand Down
5 changes: 4 additions & 1 deletion coriolis/tests/osmorphing/test_redhat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,17 +687,20 @@ def test_pre_packages_install_has_grubby(
mock_yum_clean_all.assert_called_once()
mock_yum_install.assert_not_called()

@mock.patch.object(
redhat.BaseRedHatMorphingTools, '_set_selinux_autorelabel')
@mock.patch.object(redhat.BaseRedHatMorphingTools, '_configure_cloud_init')
@mock.patch.object(redhat.BaseRedHatMorphingTools, '_run_dracut')
@mock.patch.object(base.BaseLinuxOSMorphingTools, 'post_packages_install')
def test_post_packages_install(
self, mock_post_packages_install, mock__run_dracut,
mock__configure_cloud_init):
mock__configure_cloud_init, mock__set_selinux_autorelabel):

self.morphing_tools.post_packages_install(self.package_names)

mock__configure_cloud_init.assert_called_once()
mock__run_dracut.assert_called_once()
mock__set_selinux_autorelabel.assert_called_once()
mock_post_packages_install.assert_called_once_with(self.package_names)

@mock.patch.object(redhat.BaseRedHatMorphingTools, '_yum_install')
Expand Down
4 changes: 3 additions & 1 deletion coriolis/tests/osmorphing/test_suse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,19 @@ def test__has_systemd_with_exception(self, mock_exec_cmd_chroot):

self.assertFalse(result)

@mock.patch.object(suse.BaseSUSEMorphingTools, '_set_selinux_autorelabel')
@mock.patch.object(suse.BaseSUSEMorphingTools, '_configure_cloud_init')
@mock.patch.object(suse.BaseSUSEMorphingTools, '_run_dracut')
@mock.patch.object(base.BaseLinuxOSMorphingTools, 'post_packages_install')
def test_post_packages_install(
self, mock_post_packages_install, mock__run_dracut,
mock__configure_cloud_init):
mock__configure_cloud_init, mock__set_selinux_autorelabel):

self.morphing_tools.post_packages_install(self.package_names)

mock__configure_cloud_init.assert_called_once()
mock__run_dracut.assert_called_once()
mock__set_selinux_autorelabel.assert_called_once()
mock_post_packages_install.assert_called_once_with(self.package_names)

@mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
Expand Down
Loading