diff options
| author | Samuel Colvin <s@muelcolvin.com> | 2020-03-09 12:09:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 19:09:42 +0700 |
| commit | 403647120348f3216fc423e70c7045cf3ebef752 (patch) | |
| tree | 5ef7110bee10216eaa8407a8d2178adc63cac8b8 | |
| parent | 8a0153efc8e2e152566a9832cdb7760241538a19 (diff) | |
| download | rq-403647120348f3216fc423e70c7045cf3ebef752.tar.gz | |
fixing HerokuWorkerShutdownTestCase after #1194 (#1213)
| -rw-r--r-- | rq/worker.py | 2 | ||||
| -rw-r--r-- | tests/test_worker.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rq/worker.py b/rq/worker.py index e778333..29ab26d 100644 --- a/rq/worker.py +++ b/rq/worker.py @@ -471,7 +471,7 @@ class Worker(object): The return value indicates whether any jobs were processed. """ - setup_loghandlers(logging_level, date_format, log_format) + setup_loghandlers(logging_level, date_format, log_format) completed_jobs = 0 self.register_birth() self.log.info("Worker %s: started, version %s", self.key, VERSION) diff --git a/tests/test_worker.py b/tests/test_worker.py index 7d8ed5a..5788d25 100644 --- a/tests/test_worker.py +++ b/tests/test_worker.py @@ -1189,7 +1189,8 @@ class HerokuWorkerShutdownTestCase(TimeoutTestCase, RQTestCase): err = 'ShutDownImminentException: shut down imminent (signal: SIGRTMIN)' self.assertTrue(stderr.endswith(err), stderr) - def test_handle_shutdown_request(self): + @mock.patch('rq.worker.logger.info') + def test_handle_shutdown_request(self, mock_logger_info): """Mutate HerokuWorker so _horse_pid refers to an artificial process and test handle_warm_shutdown_request""" w = HerokuWorker('foo') @@ -1202,8 +1203,11 @@ class HerokuWorkerShutdownTestCase(TimeoutTestCase, RQTestCase): w._horse_pid = p.pid w.handle_warm_shutdown_request() p.join(2) - self.assertEqual(p.exitcode, -34) + # would expect p.exitcode to be -34 but for some reason os.waitpid is setting it to None, even though + # the process has ended + self.assertEqual(p.exitcode, None) self.assertFalse(os.path.exists(path)) + mock_logger_info.assert_called_with('Killed horse pid %s', p.pid) def test_handle_shutdown_request_no_horse(self): """Mutate HerokuWorker so _horse_pid refers to non existent process |