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

Fix misc tests

Browse source
This commit is contained in:
Thomas Jackson 2015-03-21 15:40:25 -07:00
parent b1ca45dcee
commit c855770bbd
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/event.py
View file

@ -66,6 +66,8 @@ from collections import MutableMapping
import salt.ext.six as six
try:
import zmq
import zmq.eventloop.ioloop
import zmq.eventloop.zmqstream
except ImportError:
# Local mode does not need zmq
pass

2
tests/unit/auth_test.py
View file

@ -92,7 +92,7 @@ class MasterACLTestCase(integration.ModuleCase):
}
}
self.clear = salt.master.ClearFuncs(opts, MagicMock(), MagicMock(), MagicMock())
self.clear = salt.master.ClearFuncs(opts, MagicMock())
self.valid_clear_load = {'tgt_type': 'glob',
'jid': '',

4
tests/unit/minion_test.py
View file

@ -14,6 +14,7 @@ from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
# Import salt libs
from salt import minion
from salt.utils import event
from salt.exceptions import SaltSystemExit
import salt.syspaths
@ -44,9 +45,8 @@ class MinionTestCase(TestCase):
'extension_modules': ''
}
with patch.dict(__opts__, opts):
testminion = minion.MinionBase(__opts__)
try:
testminion._prepare_minion_event_system()
event_publisher = event.AsyncEventPublisher(__opts__, lambda x: True)
result = True
except SaltSystemExit:
result = False