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

Workaround for tornado test startup error

Browse source
This commit is contained in:
Mike Place 2016-10-25 16:45:32 +09:00
parent 88bcfa2c0a
commit a6a24c2b3b
No known key found for this signature in database
GPG key ID: 9136F4F13705CFD3
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/unit/netapi/rest_tornado/test_handlers.py
View file

@ -87,12 +87,18 @@ class SaltnadoTestCase(integration.ModuleCase, AsyncHTTPTestCase):
return self.auth.mk_token(self.auth_creds_dict)
def setUp(self):
super(SaltnadoTestCase, self).setUp()
try:
super(SaltnadoTestCase, self).setUp()
except NotImplementedError:
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: