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

Test fix: remove tornado testing lib from class

Browse source 
This use in the test class causing a failure in this branch that doesn't occur
in the 2017.7 branch. This tornado lib is also not necessary for this particular
test class.

This might cause a failure in the windows tests, but I have already spoken
to @dwoz about this and he is going to address this in a separate PR if needed.
This commit is contained in:
rallytime 2018-04-19 12:04:58 -04:00
parent a40f007962
commit 878fa06134
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/unit/test_minion.py
View file

@ -18,14 +18,13 @@ import salt.utils.event as event
from salt.exceptions import SaltSystemExit
import salt.syspaths
import tornado
import tornado.testing
from salt.ext.six.moves import range
__opts__ = {}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class MinionTestCase(TestCase, tornado.testing.AsyncTestCase):
class MinionTestCase(TestCase):
def test_invalid_master_address(self):
with patch.dict(__opts__, {'ipv6': False, 'master': float('127.0'), 'master_port': '4555', 'retry_dns': False}):
self.assertRaises(SaltSystemExit, salt.minion.resolve_dns, __opts__)