valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2017.7' into fix_win_service

Browse Source
This commit is contained in:
Mike Place 2018-09-03 08:16:52 -06:00 committed by GitHub
commit c69560ccb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/modules/test_cp.py
View File

@ -616,4 +616,4 @@ class CPModuleTest(ModuleCase):
os.unlink(tgt_cache_file)
def test_envs(self):
self.assertEqual(self.run_function('cp.envs'), ['base', 'prod'])
self.assertEqual(sorted(self.run_function('cp.envs')), sorted(['base', 'prod']))

3
tests/integration/modules/test_ntp.py
View File

@ -6,12 +6,13 @@ from __future__ import absolute_import
# Import Salt Testing libs
from tests.support.case import ModuleCase
from tests.support.unit import skipIf
from tests.support.helpers import destructiveTest
from tests.support.helpers import destructiveTest, flaky
# Import Salt Libs
import salt.utils
@flaky
@skipIf(not salt.utils.is_windows(), 'Tests for only Windows')
class NTPTest(ModuleCase):
'''