[Supervisor-checkins] r787 - in supervisor/trunk/src/supervisor: . tests

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Fri Jul 25 23:04:46 2008
New Revision: 787

Log:
Remove reread: it doesn't actually do anything yet.


Modified:
   supervisor/trunk/src/supervisor/supervisorctl.py
   supervisor/trunk/src/supervisor/tests/test_supervisorctl.py

Modified: supervisor/trunk/src/supervisor/supervisorctl.py
==============================================================================
--- supervisor/trunk/src/supervisor/supervisorctl.py	(original)
+++ supervisor/trunk/src/supervisor/supervisorctl.py	Fri Jul 25 23:04:46 2008
@@ -659,19 +659,6 @@
         else:
             self.ctl.output("No config updates to proccesses")
 
-    def do_reread(self, arg):
-        supervisor = self.ctl.get_supervisor()
-        try:
-            result = supervisor.reloadConfig()
-        except xmlrpclib.Fault, e:
-            if e.faultCode == xmlrpc.Faults.SHUTDOWN_STATE:
-                self.ctl.output('ERROR: already shutting down')
-        else:
-            self._formatChanges(result[0])
-
-    def help_reread(self):
-        self.ctl.output("reread \t\t\tReload the daemon's configuration files")
-
     def do_add(self, arg):
         names = arg.strip().split()
 

Modified: supervisor/trunk/src/supervisor/tests/test_supervisorctl.py
==============================================================================
--- supervisor/trunk/src/supervisor/tests/test_supervisorctl.py	(original)
+++ supervisor/trunk/src/supervisor/tests/test_supervisorctl.py	Fri Jul 25 23:04:46 2008
@@ -466,14 +466,6 @@
         plugin._formatChanges([['added'], ['changed'], ['dropped']])
         plugin._formatChanges([[], [], []])
 
-    def test_reread(self):
-        plugin = self._makeOne()
-        calls = []
-        plugin._formatChanges = lambda x: calls.append(x)
-        result = plugin.do_reread(None)
-        self.assertEqual(result, None)
-        self.assertEqual(calls[0], [['added'], ['changed'], ['dropped']])
-
     def test_add(self):
         plugin = self._makeOne()
         result = plugin.do_add('foo')