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 #49442 from rallytime/bp-49180

Browse source 
Back-port #49180 and related fixes to 2018.3.3
This commit is contained in:
Nicole Thomas 2018-08-30 14:02:53 -04:00 • committed by GitHub
commit 60758059c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/states/test_file.py
View file

@ -767,6 +767,8 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
name = '/etc/testdir'
user = 'salt'
group = 'saltstack'
if salt.utils.platform.is_windows():
name = name.replace('/', '\\')
ret = {'name': name,
'result': False,
@ -863,7 +865,7 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
else:
comt = ('The following files will be changed:\n{0}:'
' directory - new\n'.format(name))
p_chg = {'/etc/testdir': {'directory': 'new'}}
p_chg = {name: {'directory': 'new'}}
ret.update({
'comment': comt,
'result': None,
@ -920,6 +922,8 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
source = 'salt://code/flask'
user = 'salt'
group = 'saltstack'
if salt.utils.platform.is_windows():
name = name.replace('/', '\\')
ret = {'name': name,
'result': False,

6
tests/whitelist.txt
View file

@ -4,21 +4,21 @@ integration.grains.test_core
integration.loader.test_ext_grains
integration.loader.test_ext_modules
integration.modules.test_aliases
integration.modules.test_autoruns
integration.modules.test_win_autoruns
integration.modules.test_beacons
integration.modules.test_config
integration.modules.test_cp
integration.modules.test_cmdmod
integration.modules.test_data
integration.modules.test_disk
integration.modules.test_firewall
integration.modules.test_win_firewall
integration.modules.test_git
integration.modules.test_grains
integration.modules.test_groupadd
integration.modules.test_hosts
integration.modules.test_mine
integration.modules.test_network
integration.modules.test_ntp
integration.modules.test_win_ntp
integration.modules.test_pillar
integration.modules.test_pip
integration.modules.test_pkg