diff options
| author | jason | 2018-04-10 16:52:14 -0600 |
|---|---|---|
| committer | jason | 2018-04-10 16:56:30 -0600 |
| commit | 777800c2acd2b760bbfaec47f66114320c47e4bb (patch) | |
| tree | 06afa0adf1184156758706f3665542e47e2c73e0 | |
| parent | 54e304200a869a33db12e18e34f6952f06fe991f (diff) | |
| download | eventmq-777800c2acd2b760bbfaec47f66114320c47e4bb.tar.gz eventmq-777800c2acd2b760bbfaec47f66114320c47e4bb.zip | |
fix style errors
| -rw-r--r-- | eventmq/tests/test_worker.py | 7 | ||||
| -rw-r--r-- | eventmq/worker.py | 2 |
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 | ||
| 16 | import logging | 16 | import logging |
| 17 | import time | ||
| 18 | import sys | 17 | import sys |
| 18 | import time | ||
| 19 | 19 | ||
| 20 | import mock | 20 | import mock |
| 21 | |||
| 21 | from .. import worker | 22 | from .. import worker |
| 22 | 23 | ||
| 23 | if sys.version[0] == '2': | 24 | if sys.version[0] == '2': |
| @@ -29,6 +30,7 @@ else: | |||
| 29 | ADDR = 'inproc://pour_the_rice_in_the_thing' | 30 | ADDR = 'inproc://pour_the_rice_in_the_thing' |
| 30 | SETUP_SUCCESS_RETVAL = 'job setup success' | 31 | SETUP_SUCCESS_RETVAL = 'job setup success' |
| 31 | 32 | ||
| 33 | |||
| 32 | def test_run_with_timeout(): | 34 | def 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 | ||
| 170 | def process_setup_hook(): | 172 | def process_setup_hook(): |
| 171 | print 'process setup hook executed' | ||
| 172 | return True | 173 | return True |
| 173 | 174 | ||
| 174 | 175 | ||
| 175 | def job_setup_hook(): | 176 | def job_setup_hook(): |
| 176 | print 'job setup hook executed' | ||
| 177 | return SETUP_SUCCESS_RETVAL | 177 | return SETUP_SUCCESS_RETVAL |
| 178 | 178 | ||
| 179 | 179 | ||
| 180 | def job_teardown_hook(): | 180 | def 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 | |||
| 24 | import sys | 24 | import sys |
| 25 | from threading import Thread | 25 | from threading import Thread |
| 26 | 26 | ||
| 27 | from .utils.functions import callable_from_name | ||
| 28 | from . import conf | 27 | from . import conf |
| 28 | from .utils.functions import callable_from_name | ||
| 29 | 29 | ||
| 30 | if sys.version[0] == '2': | 30 | if sys.version[0] == '2': |
| 31 | import Queue | 31 | import Queue |