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

Merge pull request #35652 from cachedout/fix_tornado_setup_error

Browse Source 
Try/except the setup call in tornado test as a workaround pending sal…
This commit is contained in:
Mike Place 2016-08-22 19:09:40 +09:00 committed by GitHub
commit 0ff2c27fc9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/netapi/rest_tornado/test_handlers.py
View File

@ -87,12 +87,21 @@ class SaltnadoTestCase(integration.ModuleCase, AsyncHTTPTestCase):
return self.auth.mk_token(self.auth_creds_dict)
def setUp(self):
super(SaltnadoTestCase, self).setUp()
# FIXME
# The try/except here and in tearDownis a temporary fix, pending the release of a
# new salt version, later than 08.22.16
try:
super(SaltnadoTestCase, self).setUp()
except (NotImplementedError, AttributeError):
pass
self.async_timeout_prev = os.environ.pop('ASYNC_TEST_TIMEOUT', None)
os.environ['ASYNC_TEST_TIMEOUT'] = str(30)
def tearDown(self):
super(SaltnadoTestCase, self).tearDown()
try:
super(SaltnadoTestCase, self).tearDown()
except AttributeError:
pass
if self.async_timeout_prev is None:
os.environ.pop('ASYNC_TEST_TIMEOUT', None)
else: