mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Merge pull request #51286 from twangboy/skip_test_cp
Skip test_get_file_templated_paths on Windows/Py3
This commit is contained in:
commit
eab0a2aaa9
@ -22,6 +22,9 @@ from tests.support.helpers import (
|
||||
from tests.support.unit import skipIf
|
||||
import tests.support.paths as paths
|
||||
|
||||
# Import 3rd party libs
|
||||
import salt.ext.six as six
|
||||
|
||||
# Import salt libs
|
||||
import salt.utils.files
|
||||
import salt.utils.path
|
||||
@ -78,6 +81,7 @@ class CPModuleTest(ModuleCase):
|
||||
self.assertNotIn('bacon', data)
|
||||
|
||||
@with_tempfile()
|
||||
@skipIf(salt.utils.platform.is_windows() and six.PY3, 'This test hangs on Windows on Py3')
|
||||
def test_get_file_templated_paths(self, tgt):
|
||||
'''
|
||||
cp.get_file
|
||||
|
Loading…
Reference in New Issue
Block a user