Check args in avail, reread, and version

Author: mnaberez

CHANGES.txt

@@ -28,9 +28,12 @@
   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
+- ``supervisorctl reload`` now show an error message if an argument is
   given.  Patch by Joel Krauska.
 
+- ``supervisorctl`` commands ``avail``, ``reread``, and ``version`` now show
+  an error message if an argument is given.
+
 3.3.1 (2016-08-02)
 ------------------
 

supervisor/supervisorctl.py

@@ -1043,6 +1043,11 @@ def _formatConfigInfo(self, configinfo):
         return template % formatted
 
     def do_avail(self, arg):
+        if arg:
+            self.handle_error('Error: avail accepts no arguments')
+            self.help_avail()
+            return
+
         supervisor = self.ctl.get_supervisor()
         try:
             configinfo = supervisor.getAllConfigInfo()
@@ -1059,6 +1064,11 @@ def help_avail(self):
         self.ctl.output("avail\t\t\tDisplay all configured processes")
 
     def do_reread(self, arg):
+        if arg:
+            self.handle_error('Error: reread accepts no arguments')
+            self.help_reread()
+            return
+
         supervisor = self.ctl.get_supervisor()
         try:
             result = supervisor.reloadConfig()
@@ -1257,6 +1267,11 @@ def help_open(self):
         self.ctl.output("\t\t(for UNIX domain socket, use unix:///socket/path)")
 
     def do_version(self, arg):
+        if arg:
+            self.handle_error('Error: version accepts no arguments')
+            self.help_version()
+            return
+
         if not self.ctl.upcheck():
             return
         supervisor = self.ctl.get_supervisor()

supervisor/tests/test_supervisorctl.py

@@ -1256,6 +1256,14 @@ def test_version(self):
         plugin.do_version(None)
         self.assertEqual(plugin.ctl.stdout.getvalue(), '3000\n')
 
+    def test_version_arg(self):
+        plugin = self._makeOne()
+        result = plugin.do_version('bad')
+        self.assertEqual(result, None)
+        val = plugin.ctl.stdout.getvalue()
+        self.assertTrue(val.startswith('Error: version accepts no arguments'), val)
+        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
+
     def test_version_upcheck_failed(self):
         plugin = self._makeOne()
         plugin.ctl.upcheck = lambda: False
@@ -1401,6 +1409,14 @@ def test_reread(self):
         self.assertEqual(calls[0], [['added'], ['changed'], ['removed']])
         self.assertEqual(plugin.ctl.exit_status, None)
 
+    def test_reread_arg(self):
+        plugin = self._makeOne()
+        result = plugin.do_reread('bad')
+        self.assertEqual(result, None)
+        val = plugin.ctl.stdout.getvalue()
+        self.assertTrue(val.startswith('Error: reread accepts no arguments'), val)
+        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
+
     def test_reread_cant_reread(self):
         plugin = self._makeOne()
         from supervisor import xmlrpc
@@ -1472,6 +1488,14 @@ def getAllConfigInfo(self):
         result = plugin.do_avail('')
         self.assertEqual(result, None)
 
+    def test_avail_arg(self):
+        plugin = self._makeOne()
+        result = plugin.do_avail('bad')
+        self.assertEqual(result, None)
+        val = plugin.ctl.stdout.getvalue()
+        self.assertTrue(val.startswith('Error: avail accepts no arguments'), val)
+        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
+
     def test_avail_shutdown_state(self):
         plugin = self._makeOne()
         supervisor = plugin.ctl.options._server.supervisor