Merge pull request #194 from pombredanne/master

Cleaning up duplicated or dead test functions as well a a few unused imports and variables

supervisor/datatypes.py

@@ -1,7 +1,6 @@
 import grp
 import os
 import pwd
-import re
 import signal
 import sys
 import socket
@@ -352,7 +351,6 @@ def existing_dirpath(v):
                        'does not exist.' % v)
 
 def logging_level(value):
-    s = str(value).lower()
     level = getLevelNumByDescription(value)
     if level is None:
         raise ValueError('bad logging level name %r' % value)

supervisor/process.py

@@ -745,7 +745,8 @@ class EventListenerPool(ProcessGroupBase):
 
     def _acceptEvent(self, event, head=False):
         # events are required to be instances
-        event_type = event.__class__
+        # this has a side effect to fail with an attribute error on 'old style' classes
+        event_type = event.__class__ 
         if not hasattr(event, 'serial'):
             event.serial = new_serial(GlobalSerial)
         if not hasattr(event, 'pool_serials'):

supervisor/tests/test_dispatchers.py

@@ -82,7 +82,6 @@ class POutputDispatcherTests(unittest.TestCase):
             'uncaptured python exception, closing channel'),result)
 
     def test_toggle_capturemode_sends_event(self):
-        executable = '/bin/cat'
         options = DummyOptions()
         config = DummyPConfig(options, 'process1', '/bin/process1',
                               stdout_logfile='/tmp/foo',

supervisor/tests/test_events.py

@@ -305,21 +305,6 @@ class TestSerializations(unittest.TestCase):
         self.assertEqual(headers['pid'], '1', headers)
         self.assertEqual(payload, 'yo')
             
-    def test_pcomm_stdout_event(self):
-        options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', 'process1','/bin/process1')
-        process1 = DummyProcess(pconfig1)
-        from supervisor.events import ProcessCommunicationStdoutEvent
-        class DummyGroup:
-            config = pconfig1
-        process1.group = DummyGroup
-        event = ProcessCommunicationStdoutEvent(process1, 1, 'yo')
-        headers, payload = self._deserialize(str(event))
-        self.assertEqual(headers['processname'], 'process1', headers)
-        self.assertEqual(headers['groupname'], 'process1', headers)
-        self.assertEqual(headers['pid'], '1', headers)
-        self.assertEqual(payload, 'yo')
-            
     def test_pcomm_stderr_event(self):
         options = DummyOptions()
         pconfig1 = DummyPConfig(options, 'process1', 'process1','/bin/process1')
@@ -489,11 +474,6 @@ class TestUtilityFunctions(unittest.TestCase):
         for name, value in events.EventTypes.__dict__.items():
             self.assertEqual(events.getEventNameByType(value), name)
 
-    def _assertStateChange(self, old, new, expected):
-        from supervisor.events import getProcessStateChangeEventType
-        klass = getProcessStateChangeEventType(old, new)
-        self.assertEqual(expected, klass)
-
 
 def test_suite():
     return unittest.findTestCases(sys.modules[__name__])

supervisor/tests/test_rpcinterfaces.py

@@ -157,7 +157,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         supervisord = DummySupervisor()
         interface = self._makeOne(supervisord)
         logfile = supervisord.options.logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write('x' * 2048)
@@ -188,7 +187,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         options.remove_error = 1
         supervisord = DummySupervisor(options)
         interface = self._makeOne(supervisord)
-        logfile = supervisord.options.logfile
         self.assertRaises(xmlrpc.RPCError, interface.clearLog)
         self.assertEqual(interface.update_text, 'clearLog')
 
@@ -390,7 +388,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         process = supervisord.process_groups['foo'].processes['foo']
         self.assertEqual(process.spawned, True)
         self.assertEqual(interface.update_text, 'startProcess')
-        from supervisor.process import ProcessStates
         process.state = ProcessStates.RUNNING
         time.sleep(.02)
         result = callback()
@@ -437,7 +434,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         process = supervisord.process_groups['foo'].processes['foo']
         self.assertEqual(process.spawned, True)
         self.assertEqual(interface.update_text, 'startProcess')
-        from supervisor.process import ProcessStates
         process.state = ProcessStates.BACKOFF
 
         time.sleep(.1)
@@ -460,7 +456,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         process = supervisord.process_groups['foo'].processes['foo']
         self.assertEqual(process.spawned, True)
         self.assertEqual(interface.update_text, 'startProcess')
-        from supervisor.process import ProcessStates
         process.state = ProcessStates.STARTING
 
         time.sleep(.2)
@@ -686,7 +681,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         self.assertEqual(process.killing, 0)
         from supervisor import http
         self.assertEqual(callback(), http.NOT_DONE_YET)
-        from supervisor.process import ProcessStates
         self.assertEqual(process.state, ProcessStates.STOPPED)
         self.assertEqual(callback(), True)
         self.assertEqual(len(supervisord.process_groups['foo'].processes), 1)
@@ -1066,7 +1060,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
                               stdout_logfile='/tmp/process1.log')
         supervisord = PopulatedDummySupervisor(options, 'process1', pconfig)
         interface = self._makeOne(supervisord)
-        import os
         process = supervisord.process_groups['process1'].processes['process1']
         logfile = process.config.stdout_logfile
 
@@ -1091,7 +1084,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stdout_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write('x' * 2048)
@@ -1128,14 +1120,13 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
                              interface.readProcessStderrLog,
                              'process1', offset=0, length=1)
 
-    def test_readProcessStdoutLog_badargs(self):
+    def test_readProcessStderrLog_badargs(self):
         from supervisor import xmlrpc
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'process1', '/bin/process1', priority=1,
                               stderr_logfile='/tmp/process1.log')
         supervisord = PopulatedDummySupervisor(options, 'process1', pconfig)
         interface = self._makeOne(supervisord)
-        import os
         process = supervisord.process_groups['process1'].processes['process1']
         logfile = process.config.stderr_logfile
 
@@ -1160,7 +1151,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stderr_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write('x' * 2048)
@@ -1195,7 +1185,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stdout_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write(letters)
@@ -1221,7 +1210,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stdout_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write(letters)
@@ -1257,7 +1245,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stdout_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write(letters)
@@ -1279,8 +1266,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
                                stdout_logfile='/tmp/fooooooo')
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig)
         interface = self._makeOne(supervisord)
-        process = supervisord.process_groups['foo'].processes['foo']
-        logfile = process.config.stdout_logfile
                 
         data, offset, overflow = interface.tailProcessStdoutLog('foo', 
                                                     offset=0, length=100)
@@ -1314,7 +1299,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stderr_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write(letters)
@@ -1340,7 +1324,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stderr_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write(letters)
@@ -1376,7 +1359,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         process = supervisord.process_groups['foo'].processes['foo']
         logfile = process.config.stderr_logfile
-        import os
         try:
             f = open(logfile, 'w+')
             f.write(letters)
@@ -1398,8 +1380,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
                                stderr_logfile='/tmp/fooooooo')
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig)
         interface = self._makeOne(supervisord)
-        process = supervisord.process_groups['foo'].processes['foo']
-        logfile = process.config.stderr_logfile
                 
         data, offset, overflow = interface.tailProcessStderrLog('foo', 
                                                     offset=0, length=100)
@@ -1435,7 +1415,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         pgroup = DummyProcessGroup(None)
         pgroup.processes = {'foo': process}
         process.error_at_clear = True
-        processes = {'foo': process}
         supervisord = DummySupervisor(process_groups={'foo':pgroup})
         interface = self._makeOne(supervisord)
         self.assertRaises(xmlrpc.RPCError, interface.clearProcessLogs, 'foo')

supervisor/tests/test_states.py

@@ -2,7 +2,6 @@
 
 import sys
 import unittest
-from StringIO import StringIO
 from supervisor import states
 
 class TopLevelProcessStateTests(unittest.TestCase):

supervisor/tests/test_supervisorctl.py

@@ -751,7 +751,6 @@ class TestDefaultControllerPlugin(unittest.TestCase):
 
     def test_update_changed_procs(self):
         from supervisor import xmlrpc
-        import xmlrpclib
 
         plugin = self._makeOne()
         supervisor = plugin.ctl.options._server.supervisor

supervisor/tests/test_supervisord.py

@@ -321,7 +321,6 @@ class SupervisordTests(unittest.TestCase):
         self.assertTrue(not result)
 
     def test_remove_process_group(self):
-        from supervisor.states import ProcessStates
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', 'foo', '/bin/foo')
         gconfig = DummyPGroupConfig(options, 'foo', pconfigs=[pconfig])

supervisor/web.py

@@ -264,7 +264,6 @@ class StatusView(MeldView):
             return 'statusnominal'
 
     def make_callback(self, namespec, action):
-        message = None
         supervisord = self.context.supervisord
 
         # the rpc interface code is already written to deal properly in a

supervisor/xmlrpc.py

@@ -213,7 +213,6 @@ class SystemNamespaceRPCInterface:
         @return array result  The result.
         """
         methods = self._listMethods()
-        L = []
         for method in methods:
             if method == name:
                 rtype = None