valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-enable the test since we now have the flaky decorator

Browse Source
This commit is contained in:
Pedro Algarvio 2017-02-24 19:39:06 +00:00
parent 2a9d2beb02
commit 53eff91efa
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/support/helpers.py
View File

@ -67,11 +67,11 @@ def flaky(caller=None, condition=True):
for attempt in range(0, 4):
try:
return caller(cls)
except AssertionError as exc:
except Exception as exc:
if attempt == 4:
raise exc
backoff_time = attempt ** 2
log.info('Found AssertionError. Waiting %s seconds to retry.', backoff_time)
log.info('Found Exception. Waiting %s seconds to retry.', backoff_time)
time.sleep(backoff_time)
return cls
return wrap

24
tests/unit/transport/test_zeromq.py
View File

@ -10,14 +10,15 @@ import time
import threading
import platform
# Import 3rd-party libs
import zmq.eventloop.ioloop
# support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x
if not hasattr(zmq.eventloop.ioloop, 'ZMQIOLoop'):
zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop
from tornado.testing import AsyncTestCase
import tornado.gen
# Import Salt libs
import salt.config
import salt.ext.six as six
import salt.utils
@ -25,16 +26,15 @@ import salt.transport.server
import salt.transport.client
import salt.exceptions
# Import Salt Testing libs
from salttesting import TestCase, skipIf
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../')
import integration
# Import Salt libs
from unit.transport.test_req import ReqChannelMixin
from unit.transport.test_pub import PubChannelMixin
# Import test support libs
import tests.integration as integration
from tests.support.helpers import flaky
from tests.unit.transport.test_req import ReqChannelMixin
from tests.unit.transport.test_pub import PubChannelMixin
ON_SUSE = False
if 'SuSE' in platform.dist():
@ -117,7 +117,7 @@ class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin):
raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
@skipIf(True, 'Skipping flaky test until Jenkins is moved to C7.')
@flaky
@skipIf(ON_SUSE, 'Skipping until https://github.com/saltstack/salt/issues/32902 gets fixed')
class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin):
def setUp(self):
@ -221,9 +221,3 @@ class AsyncPubChannelTest(BaseZMQPubCase, PubChannelMixin):
'''
def get_new_ioloop(self):
return zmq.eventloop.ioloop.ZMQIOLoop()
if __name__ == '__main__':
from integration import run_tests
run_tests(ClearReqTestCases, needs_daemon=False)
run_tests(AESReqTestCases, needs_daemon=False)