Set non-zero exit status if reload is given args

Author: mnaberez

CHANGES.txt

@@ -28,6 +28,9 @@
   error condition occurs.  Previous versions did not set the exit status so
   it was always zero.  Patch by Luke Weber.
 
+- ``supervisorctl reload`` now gives an error message if an argument is
+  given.  Patch by Joel Krauska.
+
 3.3.1 (2016-08-02)
 ------------------
 

supervisor/supervisorctl.py

@@ -984,10 +984,10 @@ def help_shutdown(self):
 
     def do_reload(self, arg):
         if arg:
-            self.ctl.output('Error: reload given with a process name. Maybe you meant restart?')
+            self.handle_error('Error: reload accepts no arguments')
             self.help_reload()
             return
- 
+
         if self.ctl.options.interactive:
             yesno = raw_input('Really restart the remote supervisord process '
                               'y/N? ')

supervisor/tests/test_supervisorctl.py

@@ -1287,6 +1287,14 @@ def test_reload(self):
         self.assertEqual(result, None)
         self.assertEqual(options._server.supervisor._restarted, True)
 
+    def test_reload_arg(self):
+        plugin = self._makeOne()
+        result = plugin.do_reload('bad')
+        self.assertEqual(result, None)
+        val = plugin.ctl.stdout.getvalue()
+        self.assertTrue(val.startswith('Error: reload accepts no arguments'), val)
+        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
+
     def test_shutdown_help(self):
         plugin = self._makeOne()
         plugin.help_shutdown()