Переглянути джерело

Change two errors from GENERIC to INVALID_ARGS for better specificity

Luke Weber 9 роки тому
батько
коміт
18aff563cf

+ 3 - 3
supervisor/supervisorctl.py

@@ -759,7 +759,7 @@ class DefaultControllerPlugin(ControllerPluginBase):
         supervisor = self.ctl.get_supervisor()
 
         if not names:
-            self.handle_error("Error: start requires a process name")
+            self.handle_error("Error: start requires a process name", code=LSBInitErrorCode.INVALID_ARGS)
             self.help_start()
             return
 
@@ -778,9 +778,9 @@ class DefaultControllerPlugin(ControllerPluginBase):
                     except xmlrpclib.Fault as e:
                         if e.faultCode == xmlrpc.Faults.BAD_NAME:
                             error = "%s: ERROR (no such group)" % group_name
-                            self.ctl.handle_error(error)
+                            self.handle_error(error, code=LSBInitErrorCode.INVALID_ARGS)
                         else:
-                            self.ctl.handle_error(fatal=True)
+                            self.handle_error(fatal=True)
                 else:
                     try:
                         result = supervisor.startProcess(name)

+ 2 - 2
supervisor/tests/test_supervisorctl.py

@@ -781,7 +781,7 @@ class TestDefaultControllerPlugin(unittest.TestCase):
         self.assertEqual(result, None)
         expected = "Error: start requires a process name"
         self.assertEqual(plugin.ctl.stdout.getvalue().split('\n')[0], expected)
-        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
+        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.INVALID_ARGS)
 
     def test_start_badname(self):
         plugin = self._makeOne()
@@ -870,7 +870,7 @@ class TestDefaultControllerPlugin(unittest.TestCase):
         self.assertEqual(result, None)
         self.assertEqual(plugin.ctl.stdout.getvalue(),
                          'BAD_NAME: ERROR (no such group)\n')
-        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
+        self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.INVALID_ARGS)
 
     def test_start_all(self):
         plugin = self._makeOne()