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 pull request #43943 from twangboy/win_unit_test_utils

Browse source 
Fix `unit.utils.test_utils` for Windows
This commit is contained in:
Mike Place 2017-10-06 13:35:23 -06:00 • committed by GitHub
commit 1baf286719
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/unit/utils/test_utils.py
View file

@ -99,7 +99,7 @@ class UtilsTestCase(TestCase):
def test_path_join(self):
with patch('salt.utils.is_windows', return_value=False) as is_windows_mock:
self.assertFalse(is_windows_mock.return_value)
expected_path = '/a/b/c/d'
expected_path = os.path.join(os.sep + 'a', 'b', 'c', 'd')
ret = utils.path_join('/a/b/c', 'd')
self.assertEqual(ret, expected_path)
@ -985,7 +985,8 @@ class UtilsTestCase(TestCase):
ret = utils.daemonize_if({})
self.assertEqual(None, ret)
with patch('salt.utils.daemonize'):
with patch('salt.utils.daemonize'), \
patch('sys.platform', 'not windows'):
utils.daemonize_if({})
self.assertTrue(utils.daemonize.called)
# pylint: enable=assignment-from-none