valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Throw away unnecessary variable handling

Browse Source
This commit is contained in:
Bo Maryniuk 2018-02-12 13:19:36 +01:00
parent 06158e4242
commit d9941ce1f3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/utils/test_parsers.py
View File

@ -1011,13 +1011,10 @@ class DaemonMixInTestCase(TestCase):
'''
Setting up
'''
# Set PID
self.pid = '/some/fake.pid'
# Setup mixin
self.mixin = salt.utils.parsers.DaemonMixIn()
self.mixin.config = {}
self.mixin.config['pidfile'] = self.pid
self.mixin.config['pidfile'] = '/some/fake.pid'
# logger
self.logger = logging.getLogger('salt.utils.parsers')
@ -1029,7 +1026,6 @@ class DaemonMixInTestCase(TestCase):
'''
del self.logger
del self.mixin
del self.pid
def test_pid_file_deletion(self):
'''
@ -1052,7 +1048,8 @@ class DaemonMixInTestCase(TestCase):
'''
self.mixin._mixin_before_exit()
assert salt.utils.parsers.os.unlink.call_count == 1
salt.utils.parsers.logger.info.assert_called_with('PIDfile could not be deleted: %s', format(self.pid))
salt.utils.parsers.logger.info.assert_called_with('PIDfile could not be deleted: %s',
format(self.mixin.config['pidfile']))
@patch('os.unlink', MagicMock(side_effect=OSError()))
@patch('os.path.isfile', MagicMock(return_value=True))