Merge pull request #48727 from dwoz/file_cp_test_fix

Windows compatible cp test
This commit is contained in:
Nicole Thomas 2018-07-24 10:41:33 -04:00 committed by GitHub
commit af837424aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,6 +21,7 @@ from tests.support.mock import (
# Import Salt Libs
import salt.utils.files
import salt.utils.templates as templates
import salt.utils.platform
import salt.transport
import salt.modules.cp as cp
from salt.exceptions import CommandExecutionError
@ -132,6 +133,8 @@ class CpTestCase(TestCase, LoaderModuleMockMixin):
Test if push works with good posix path.
'''
filename = '/saltines/test.file'
if salt.utils.platform.is_windows():
filename = 'c:\\saltines\\test.file'
with patch('salt.modules.cp.os.path',
MagicMock(isfile=Mock(return_value=True), wraps=cp.os.path)), \
patch.multiple('salt.modules.cp',