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

Py3 compatibility fixes

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-21 20:42:32 +00:00
parent 0726464344
commit c3d922bdc4
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/unit/utils/event_test.py
View file

@ -27,6 +27,9 @@ import integration
from salt.utils.process import clean_proc
from salt.utils import event
# Import 3rd-+arty libs
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
SOCK_DIR = os.path.join(integration.TMP, 'test-socks')
NO_LONG_IPC = False
@ -278,7 +281,7 @@ class TestSaltEvent(TestCase):
with eventpublisher_process():
me = event.MasterEvent(SOCK_DIR)
me.subscribe()
for i in xrange(500):
for i in range(500):
me.fire_event({'data': '{0}'.format(i)}, 'testevents')
evt = me.get_event(tag='testevents')
self.assertGotEvent(evt, {'data': '{0}'.format(i)}, 'Event {0}'.format(i))
@ -289,9 +292,9 @@ class TestSaltEvent(TestCase):
me = event.MasterEvent(SOCK_DIR)
me.subscribe()
# Must not exceed zmq HWM
for i in xrange(500):
for i in range(500):
me.fire_event({'data': '{0}'.format(i)}, 'testevents')
for i in xrange(500):
for i in range(500):
evt = me.get_event(tag='testevents')
self.assertGotEvent(evt, {'data': '{0}'.format(i)}, 'Event {0}'.format(i))