Jelajahi Sumber

Display short names consistently in start and stop. Refs #300
Before:
supervisor> status foo:foo
foo STOPPED Mar 05 01:28 PM
supervisor> start foo:foo
foo:foo: started

After:
supervisor> status foo:foo
foo STOPPED Mar 05 01:28 PM
supervisor> start foo:foo
foo: started

Mike Naberezny 11 tahun lalu
induk
melakukan
96425bd972
2 mengubah file dengan 16 tambahan dan 0 penghapusan
  1. 2 0
      supervisor/supervisorctl.py
  2. 14 0
      supervisor/tests/test_supervisorctl.py

+ 2 - 0
supervisor/supervisorctl.py

@@ -698,6 +698,7 @@ class DefaultControllerPlugin(ControllerPluginBase):
                                                    'description': e.faultString})
                         self.ctl.output(error)
                     else:
+                        name = make_namespec(group_name, process_name)
                         self.ctl.output('%s: started' % name)
 
     def help_start(self):
@@ -766,6 +767,7 @@ class DefaultControllerPlugin(ControllerPluginBase):
                                                   'description':e.faultString})
                         self.ctl.output(error)
                     else:
+                        name = make_namespec(group_name, process_name)
                         self.ctl.output('%s: stopped' % name)
 
     def help_stop(self):

+ 14 - 0
supervisor/tests/test_supervisorctl.py

@@ -599,6 +599,13 @@ class TestDefaultControllerPlugin(unittest.TestCase):
         self.assertEqual(plugin.ctl.stdout.getvalue(),
                          'foo: started\n')
 
+    def test_start_one_with_group_name_success(self):
+        plugin = self._makeOne()
+        result = plugin.do_start('foo:foo')
+        self.assertEqual(result, None)
+        self.assertEqual(plugin.ctl.stdout.getvalue(),
+                         'foo: started\n')
+
     def test_start_many(self):
         plugin = self._makeOne()
         result = plugin.do_start('foo bar')
@@ -658,6 +665,13 @@ class TestDefaultControllerPlugin(unittest.TestCase):
         self.assertEqual(plugin.ctl.stdout.getvalue(),
                          'foo: stopped\n')
 
+    def test_stop_one_with_group_name_success(self):
+        plugin = self._makeOne()
+        result = plugin.do_stop('foo:foo')
+        self.assertEqual(result, None)
+        self.assertEqual(plugin.ctl.stdout.getvalue(),
+                         'foo: stopped\n')
+
     def test_stop_many(self):
         plugin = self._makeOne()
         result = plugin.do_stop('foo bar')