mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
fixing setup fixture for test_mac_group to cleanup properly after each test
This commit is contained in:
parent
c087f7f47d
commit
cf72e134cf
1 changed files with 1 additions and 13 deletions
|
@ -44,7 +44,7 @@ def rep_user_group():
|
|||
yield random_string("RS-", lowercase=False)
|
||||
|
||||
|
||||
@pytest.fixture(scope="module", autouse=True)
|
||||
@pytest.fixture(autouse=True)
|
||||
def _setup_teardown_vars(group, add_group, change_group, del_group):
|
||||
try:
|
||||
yield
|
||||
|
@ -73,8 +73,6 @@ def test_mac_group_add(group, add_group):
|
|||
group_info = group.info(add_group)
|
||||
assert group_info["name"] == add_group
|
||||
|
||||
group.delete(add_group)
|
||||
|
||||
|
||||
def test_mac_group_delete(group, del_group):
|
||||
"""
|
||||
|
@ -105,8 +103,6 @@ def test_mac_group_chgid(group, change_group):
|
|||
group_info = group.info(change_group)
|
||||
assert group_info["gid"] == 6789
|
||||
|
||||
group.delete(change_group)
|
||||
|
||||
|
||||
def test_mac_adduser(group, add_group, add_user):
|
||||
"""
|
||||
|
@ -122,8 +118,6 @@ def test_mac_adduser(group, add_group, add_user):
|
|||
group_info = group.info(add_group)
|
||||
assert add_user == "".join(group_info["members"])
|
||||
|
||||
group.delete(add_group)
|
||||
|
||||
|
||||
def test_mac_deluser(group, add_group, add_user):
|
||||
"""
|
||||
|
@ -143,8 +137,6 @@ def test_mac_deluser(group, add_group, add_user):
|
|||
group_info = group.info(add_group)
|
||||
assert add_user not in "".join(group_info["members"])
|
||||
|
||||
group.delete(add_group)
|
||||
|
||||
|
||||
def test_mac_members(group, add_group, add_user, rep_user_group):
|
||||
"""
|
||||
|
@ -168,8 +160,6 @@ def test_mac_members(group, add_group, add_user, rep_user_group):
|
|||
assert rep_user_group in str(group_info["members"])
|
||||
assert add_user not in str(group_info["members"])
|
||||
|
||||
group.delete(add_group)
|
||||
|
||||
|
||||
def test_mac_getent(group, add_group, add_user):
|
||||
"""
|
||||
|
@ -189,5 +179,3 @@ def test_mac_getent(group, add_group, add_user):
|
|||
assert getinfo
|
||||
assert add_group in str(getinfo)
|
||||
assert add_user in str(getinfo)
|
||||
|
||||
group.delete(add_group)
|
||||
|
|
Loading…
Add table
Reference in a new issue