correct wording in docstring and tests

rq/worker.py

@@ -732,7 +732,8 @@ class HerokuWorker(Worker):
     """
     Modified version of rq worker which:
     * stops work horses getting killed with SIGTERM
-    * sends SIGRTMIN to work horses on SIGTERM to the main process so they can crash as they wish
+    * sends SIGRTMIN to work horses on SIGTERM to the main process which in turn
+    causes the horse to crash `imminent_shutdown_delay` seconds later
     """
     imminent_shutdown_delay = 6
     frame_properties = ['f_code', 'f_exc_traceback', 'f_exc_type', 'f_exc_value',

tests/fixtures.py

@@ -107,17 +107,18 @@ def long_running_job(timeout=10):
 
 def run_dummy_heroku_worker(sandbox, _imminent_shutdown_delay):
     """
-    Run a simplified heroku worker where perform_job job just creates two files 2 seconds apart
+    Run the work horse for a simplified heroku worker where perform_job just
+    creates two sentinel files 2 seconds apart.
     :param sandbox: directory to create files in
-    :param _imminent_shutdown_delay: delay to use for TestHerokuWorker
-    :return:
+    :param _imminent_shutdown_delay: delay to use for HerokuWorker
     """
     class TestHerokuWorker(HerokuWorker):
         imminent_shutdown_delay = _imminent_shutdown_delay
 
         def perform_job(self, job, queue):
             create_file(os.path.join(sandbox, 'started'))
-            # have to loop here rather than one sleep to avoid holding the GIL and preventing signals being recieved
+            # have to loop here rather than one sleep to avoid holding the GIL
+            # and preventing signals being received
             for i in range(20):
                 time.sleep(0.1)
             create_file(os.path.join(sandbox, 'finished'))

tests/test_worker.py

@@ -691,19 +691,6 @@ class HerokuWorkerShutdownTestCase(TimeoutTestCase, RQTestCase):
     def tearDown(self):
         shutil.rmtree(self.sandbox, ignore_errors=True)
 
-    @slow
-    def test_idle_worker_shutdown(self):
-        """worker with no ongoing job receiving single SIGTERM signal and shutting down"""
-        w = HerokuWorker('foo')
-        self.assertFalse(w._stop_requested)
-        p = Process(target=kill_worker, args=(os.getpid(), False))
-        p.start()
-
-        w.work()
-
-        p.join(1)
-        self.assertFalse(w._stop_requested)
-
     @slow
     def test_immediate_shutdown(self):
         """Heroku work horse shutdown with immediate (0 second) kill"""
@@ -752,7 +739,8 @@ class HerokuWorkerShutdownTestCase(TimeoutTestCase, RQTestCase):
         self.assertFalse(os.path.exists(os.path.join(self.sandbox, 'finished')))
 
     def test_handle_shutdown_request(self):
-        """Mutate HerokuWorker so _horse_pid refers to an artificial process and test handle_warm_shutdown_request"""
+        """Mutate HerokuWorker so _horse_pid refers to an artificial process
+        and test handle_warm_shutdown_request"""
         w = HerokuWorker('foo')
 
         path = os.path.join(self.sandbox, 'shouldnt_exist')
@@ -767,7 +755,8 @@ class HerokuWorkerShutdownTestCase(TimeoutTestCase, RQTestCase):
         self.assertFalse(os.path.exists(path))
 
     def test_handle_shutdown_request_no_horse(self):
-        """Mutate HerokuWorker so _horse_pid refers to non existent process and test handle_warm_shutdown_request"""
+        """Mutate HerokuWorker so _horse_pid refers to non existent process
+        and test handle_warm_shutdown_request"""
         w = HerokuWorker('foo')
 
         w._horse_pid = 19999