mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Updated tests for removed RHEL 5 support
This commit is contained in:
parent
98422f3848
commit
60086b0fa0
1 changed files with 0 additions and 30 deletions
|
@ -206,18 +206,12 @@ def test_adduser():
|
||||||
"salt.utils.path.which",
|
"salt.utils.path.which",
|
||||||
MagicMock(
|
MagicMock(
|
||||||
side_effect=[
|
side_effect=[
|
||||||
None,
|
|
||||||
"/bin/gpasswd",
|
|
||||||
"/bin/usermod",
|
"/bin/usermod",
|
||||||
"/bin/gpasswd",
|
"/bin/gpasswd",
|
||||||
"/bin/usermod",
|
"/bin/usermod",
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
):
|
):
|
||||||
with patch.dict(groupadd.__grains__, os_version_list[0]["grains"]):
|
|
||||||
with pytest.raises(CommandExecutionError):
|
|
||||||
groupadd.adduser("test", "root")
|
|
||||||
|
|
||||||
for os_version in os_version_list:
|
for os_version in os_version_list:
|
||||||
mock = MagicMock(return_value={"retcode": 0})
|
mock = MagicMock(return_value={"retcode": 0})
|
||||||
with patch.dict(groupadd.__grains__, os_version["grains"]), patch.dict(
|
with patch.dict(groupadd.__grains__, os_version["grains"]), patch.dict(
|
||||||
|
@ -253,30 +247,12 @@ def test_deluser():
|
||||||
"salt.utils.path.which",
|
"salt.utils.path.which",
|
||||||
MagicMock(
|
MagicMock(
|
||||||
side_effect=[
|
side_effect=[
|
||||||
None,
|
|
||||||
"/bin/gpasswd",
|
|
||||||
"/bin/usermod",
|
"/bin/usermod",
|
||||||
"/bin/gpasswd",
|
"/bin/gpasswd",
|
||||||
"/bin/usermod",
|
"/bin/usermod",
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
):
|
):
|
||||||
with patch.dict(groupadd.__grains__, os_version_list[0]["grains"]), patch.dict(
|
|
||||||
groupadd.__salt__,
|
|
||||||
{
|
|
||||||
"group.info": MagicMock(
|
|
||||||
return_value={
|
|
||||||
"passwd": "*",
|
|
||||||
"gid": 0,
|
|
||||||
"name": "test",
|
|
||||||
"members": ["root"],
|
|
||||||
}
|
|
||||||
),
|
|
||||||
},
|
|
||||||
):
|
|
||||||
with pytest.raises(CommandExecutionError):
|
|
||||||
groupadd.deluser("test", "root")
|
|
||||||
|
|
||||||
for os_version in os_version_list:
|
for os_version in os_version_list:
|
||||||
mock_retcode = MagicMock(return_value=0)
|
mock_retcode = MagicMock(return_value=0)
|
||||||
mock_stdout = MagicMock(return_value="test foo")
|
mock_stdout = MagicMock(return_value="test foo")
|
||||||
|
@ -328,8 +304,6 @@ def test_members():
|
||||||
"salt.utils.path.which",
|
"salt.utils.path.which",
|
||||||
MagicMock(
|
MagicMock(
|
||||||
side_effect=[
|
side_effect=[
|
||||||
None,
|
|
||||||
"/bin/gpasswd",
|
|
||||||
"/bin/gpasswd",
|
"/bin/gpasswd",
|
||||||
"/bin/groupmod",
|
"/bin/groupmod",
|
||||||
"/bin/gpasswd",
|
"/bin/gpasswd",
|
||||||
|
@ -339,10 +313,6 @@ def test_members():
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
):
|
):
|
||||||
with patch.dict(groupadd.__grains__, os_version_list[0]["grains"]):
|
|
||||||
with pytest.raises(CommandExecutionError):
|
|
||||||
groupadd.members("test", "foo")
|
|
||||||
|
|
||||||
for os_version in os_version_list:
|
for os_version in os_version_list:
|
||||||
mock_ret = MagicMock(return_value={"retcode": 0})
|
mock_ret = MagicMock(return_value={"retcode": 0})
|
||||||
mock_stdout = MagicMock(return_value={"cmd.run_stdout": 1})
|
mock_stdout = MagicMock(return_value={"cmd.run_stdout": 1})
|
||||||
|
|
Loading…
Add table
Reference in a new issue