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 #49475 from dwoz/flaky_tests

Browse source 
Fix a flaky test and mark another as flaky
This commit is contained in:
Daniel Wozniak 2018-09-02 12:40:29 -07:00 • committed by GitHub
commit 1cdaea22b0
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):
'''