aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason2018-04-10 16:52:14 -0600
committerjason2018-04-10 16:56:30 -0600
commit777800c2acd2b760bbfaec47f66114320c47e4bb (patch)
tree06afa0adf1184156758706f3665542e47e2c73e0
parent54e304200a869a33db12e18e34f6952f06fe991f (diff)
downloadeventmq-777800c2acd2b760bbfaec47f66114320c47e4bb.tar.gz
eventmq-777800c2acd2b760bbfaec47f66114320c47e4bb.zip
fix style errors
-rw-r--r--eventmq/tests/test_worker.py7
-rw-r--r--eventmq/worker.py2
2 files changed, 4 insertions, 5 deletions
diff --git a/eventmq/tests/test_worker.py b/eventmq/tests/test_worker.py
index b8e4f3e..ec13be6 100644
--- a/eventmq/tests/test_worker.py
+++ b/eventmq/tests/test_worker.py
@@ -14,10 +14,11 @@
14# along with eventmq. If not, see <http://www.gnu.org/licenses/>. 14# along with eventmq. If not, see <http://www.gnu.org/licenses/>.
15 15
16import logging 16import logging
17import time
18import sys 17import sys
18import time
19 19
20import mock 20import mock
21
21from .. import worker 22from .. import worker
22 23
23if sys.version[0] == '2': 24if sys.version[0] == '2':
@@ -29,6 +30,7 @@ else:
29ADDR = 'inproc://pour_the_rice_in_the_thing' 30ADDR = 'inproc://pour_the_rice_in_the_thing'
30SETUP_SUCCESS_RETVAL = 'job setup success' 31SETUP_SUCCESS_RETVAL = 'job setup success'
31 32
33
32def test_run_with_timeout(): 34def test_run_with_timeout():
33 payload = { 35 payload = {
34 'path': 'eventmq.tests.test_worker', 36 'path': 'eventmq.tests.test_worker',
@@ -168,15 +170,12 @@ def job(sleep_time=0):
168 170
169 171
170def process_setup_hook(): 172def process_setup_hook():
171 print 'process setup hook executed'
172 return True 173 return True
173 174
174 175
175def job_setup_hook(): 176def job_setup_hook():
176 print 'job setup hook executed'
177 return SETUP_SUCCESS_RETVAL 177 return SETUP_SUCCESS_RETVAL
178 178
179 179
180def job_teardown_hook(): 180def job_teardown_hook():
181 print 'job teardown hook executed'
182 return True 181 return True
diff --git a/eventmq/worker.py b/eventmq/worker.py
index aa03284..1f3a6fa 100644
--- a/eventmq/worker.py
+++ b/eventmq/worker.py
@@ -24,8 +24,8 @@ import os
24import sys 24import sys
25from threading import Thread 25from threading import Thread
26 26
27from .utils.functions import callable_from_name
28from . import conf 27from . import conf
28from .utils.functions import callable_from_name
29 29
30if sys.version[0] == '2': 30if sys.version[0] == '2':
31 import Queue 31 import Queue