Reintroduce docstrings in programmatic start

celery/app/base.py

@@ -356,10 +356,17 @@ def close(self):
         _deregister_app(self)
 
     def start(self, argv=None):
+        """Run :program:`celery` using `argv`.
+
+        Uses :data:`sys.argv` if `argv` is not specified.
+        """
         from celery.bin.celery import celery
 
         celery.params[0].default = self
 
+        if argv is None:
+            argv = sys.argv
+
         try:
             celery.main(args=argv, standalone_mode=False)
         except Exit as e:
@@ -368,6 +375,10 @@ def start(self, argv=None):
             celery.params[0].default = None
 
     def worker_main(self, argv=None):
+        """Run :program:`celery worker` using `argv`.
+
+        Uses :data:`sys.argv` if `argv` is not specified.
+        """
         if argv is None:
             argv = sys.argv
 

t/unit/app/test_app.py

@@ -579,20 +579,12 @@ def test_pickle_app(self):
         for key, value in changes.items():
             assert restored.conf[key] == value
 
-    # def test_worker_main(self):
-    #     from celery.bin import worker as worker_bin
-    #
-    #     class worker(worker_bin.worker):
-    #
-    #         def execute_from_commandline(self, argv):
-    #             return argv
-    #
-    #     prev, worker_bin.worker = worker_bin.worker, worker
-    #     try:
-    #         ret = self.app.worker_main(argv=['--version'])
-    #         assert ret == ['--version']
-    #     finally:
-    #         worker_bin.worker = prev
+    @patch('celery.bin.celery.celery')
+    def test_worker_main(self, mocked_celery):
+        self.app.worker_main(argv=['worker', '--help'])
+
+        mocked_celery.main.assert_called_with(
+            args=['worker', '--help'], standalone_mode=False)
 
     def test_config_from_envvar(self):
         os.environ['CELERYTEST_CONFIG_OBJECT'] = 't.unit.app.test_app'
@@ -775,6 +767,11 @@ def test_config_from_envvar_more(self, key='CELERY_HARNESS_CFG1'):
         assert self.app.conf['FOO'] == 10
         assert self.app.conf['BAR'] == 20
 
+    @patch('celery.bin.celery.celery')
+    def test_start(self, mocked_celery):
+        self.app.start()
+        mocked_celery.main.assert_called()
+
     @pytest.mark.parametrize('url,expected_fields', [
         ('pyamqp://', {
             'hostname': 'localhost',