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 #45382 from terminalmage/salt-jenkins-686

Browse source 
Skip flaky test on 2017.7 branch
This commit is contained in:
Nicole Thomas 2018-01-11 09:23:04 -05:00 • committed by GitHub
commit d15f9e1020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/ssh/test_state.py
View file

@ -9,6 +9,7 @@ import time
# Import Salt Testing Libs
from tests.support.case import SSHCase
from tests.support.paths import TMP
from tests.support.unit import skipIf
# Import Salt Libs
from salt.ext import six
@ -63,12 +64,13 @@ class SSHStateTest(SSHCase):
check_file = self.run_function('file.file_exists', [SSH_SLS_FILE], wipe=False)
self.assertFalse(check_file)
@skipIf(six.PY3, 'Skipped on Python3 for 2017.7 branch only')
def test_state_show_top(self):
'''
test state.show_top with salt-ssh
'''
ret = self.run_function('state.show_top')
self.assertEqual(ret, {u'base': list(set([u'master_tops_test']).union([u'core']))})
self.assertEqual(ret, {'base': list(set(['master_tops_test']).union(['core']))})
def test_state_single(self):
'''