Skip to content

Commit

Permalink
Merge pull request #1383 from poncovka/f28-devel-fix_user_module
Browse files Browse the repository at this point in the history
User module should parse only rootpw for now (#1553488)
  • Loading branch information
poncovka committed Mar 9, 2018
2 parents 8a3d1f7 + 544a83e commit 16fe127
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions pyanaconda/modules/user/kickstart.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
# License and may only be used or replicated with the express permission of
# Red Hat, Inc.
#
from pykickstart.commands.user import F24_User
from pykickstart.commands.rootpw import F18_RootPw
from pykickstart.commands.group import F12_Group
from pykickstart.version import F28
from pyanaconda.core.kickstart import KickstartSpecification

Expand All @@ -28,7 +26,5 @@ class UserKickstartSpecification(KickstartSpecification):

version = F28
commands = {
"rootpw": F18_RootPw,
"user": F24_User,
"group": F12_Group,
"rootpw": F18_RootPw
}
2 changes: 1 addition & 1 deletion tests/pyanaconda_tests/module_user_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def setUp(self):

def kickstart_properties_test(self):
"""Test kickstart properties."""
self.assertEqual(self.user_interface.KickstartCommands, ["rootpw", "user", "group"])
self.assertEqual(self.user_interface.KickstartCommands, ["rootpw"])
self.assertEqual(self.user_interface.KickstartSections, [])
self.assertEqual(self.user_interface.KickstartAddons, [])
self.callback.assert_not_called()
Expand Down

0 comments on commit 16fe127

Please sign in to comment.