Skip to content
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

Fix unit.modules.test_win_goupadd on Windows #50875

Merged
merged 1 commit into from
Dec 14, 2018
Merged

Fix unit.modules.test_win_goupadd on Windows #50875

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
13 changes: 7 additions & 6 deletions tests/unit/modules/test_win_groupadd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def test_add_group_exists(self):
'members': ['HOST\\spongebob']})
with patch.object(win_groupadd, 'info', info),\
patch.object(win_groupadd, '_get_computer_object', Mock()):
self.assertTrue(win_groupadd.add('foo'))
self.assertFalse(win_groupadd.add('foo'))

def test_add_error(self):
'''
Expand Down Expand Up @@ -131,7 +131,7 @@ def test_delete_no_group(self):
info = MagicMock(return_value=False)
with patch.object(win_groupadd, 'info', info), \
patch.object(win_groupadd, '_get_computer_object', Mock()):
self.assertTrue(win_groupadd.delete('foo'))
self.assertFalse(win_groupadd.delete('foo'))

def test_delete_error(self):
'''
Expand Down Expand Up @@ -199,7 +199,7 @@ def test_adduser_already_exists(self):
obj_group_mock = MagicMock(return_value=MockGroupObj('foo', ['WinNT://HOST/steve']))
with patch.object(win_groupadd, '_get_group_object', obj_group_mock), \
patch.object(salt.utils.win_functions, 'get_sam_name', sam_mock):
self.assertTrue(win_groupadd.adduser('foo', 'steve'))
self.assertFalse(win_groupadd.adduser('foo', 'steve'))

def test_adduser_error(self):
'''
Expand Down Expand Up @@ -227,7 +227,8 @@ def test_deluser(self):
'''
# Test removing a user
obj_group_mock = MagicMock(return_value=MockGroupObj('foo', ['WinNT://HOST/spongebob']))
with patch.object(win_groupadd, '_get_group_object', obj_group_mock):
with patch.object(win_groupadd, '_get_group_object', obj_group_mock), \
patch.object(salt.utils.win_functions, 'get_sam_name', sam_mock):
self.assertTrue(win_groupadd.deluser('foo', 'spongebob'))

def test_deluser_no_user(self):
Expand All @@ -238,7 +239,7 @@ def test_deluser_no_user(self):
obj_group_mock = MagicMock(return_value=MockGroupObj('foo', ['WinNT://HOST/steve']))
with patch.object(win_groupadd, '_get_group_object', obj_group_mock), \
patch.object(salt.utils.win_functions, 'get_sam_name', sam_mock):
self.assertTrue(win_groupadd.deluser('foo', 'spongebob'))
self.assertFalse(win_groupadd.deluser('foo', 'spongebob'))

def test_deluser_error(self):
'''
Expand All @@ -251,7 +252,7 @@ def Remove(self, name):
obj_group_mock = MagicMock(return_value=GroupObj('foo', ['WinNT://HOST/spongebob']))
with patch.object(win_groupadd, '_get_group_object', obj_group_mock), \
patch.object(salt.utils.win_functions, 'get_sam_name', sam_mock):
self.assertTrue(win_groupadd.deluser('foo', 'spongebob'))
self.assertFalse(win_groupadd.deluser('foo', 'spongebob'))

def test_deluser_group_does_not_exist(self):
obj_group_mock = MagicMock(side_effect=PYWINTYPES_ERROR)
Expand Down