saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2016.11' into '2017.7'

Browse source 
Conflicts:
  - tests/unit/utils/test_parsers.py
This commit is contained in:
rallytime 2018-01-04 17:37:48 -05:00
commit 8025b14584
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/parsers.py
View file

@ -969,7 +969,7 @@ class DaemonMixIn(six.with_metaclass(MixInMeta, object)):
try:
os.unlink(self.config['pidfile'])
except OSError as err:
self.info(
logging.getLogger(__name__).info(
'PIDfile could not be deleted: {0}'.format(
self.config['pidfile']
)

13
tests/unit/utils/test_parsers.py
View file

@ -5,6 +5,7 @@
# Import python libs
from __future__ import absolute_import
import logging
import os
# Import Salt Testing Libs
@ -1010,19 +1011,21 @@ class DaemonMixInTestCase(TestCase):
# Setup mixin
self.mixin = salt.utils.parsers.DaemonMixIn()
self.mixin.info = None
self.mixin.config = {}
self.mixin.config['pidfile'] = self.pid
# logger
self.logger = logging.getLogger('salt.utils.parsers')
def test_pid_file_deletion(self):
'''
PIDfile deletion without exception.
'''
with patch('os.unlink', MagicMock()) as os_unlink:
with patch('os.path.isfile', MagicMock(return_value=True)):
with patch.object(self.mixin, 'info', MagicMock()):
with patch.object(self.logger, 'info') as mock_logger:
self.mixin._mixin_before_exit()
assert self.mixin.info.call_count == 0
assert mock_logger.call_count == 0
assert os_unlink.call_count == 1
def test_pid_file_deletion_with_oserror(self):
@ -1031,10 +1034,10 @@ class DaemonMixInTestCase(TestCase):
'''
with patch('os.unlink', MagicMock(side_effect=OSError())) as os_unlink:
with patch('os.path.isfile', MagicMock(return_value=True)):
with patch.object(self.mixin, 'info', MagicMock()):
with patch.object(self.logger, 'info') as mock_logger:
self.mixin._mixin_before_exit()
assert os_unlink.call_count == 1
self.mixin.info.assert_called_with(
mock_logger.assert_called_with(
'PIDfile could not be deleted: {0}'.format(self.pid))
# Hide the class from unittest framework when it searches for TestCase classes in the module