Rewrite signal() tests to work like all the others

Author: mnaberez

supervisor/tests/test_process.py

@@ -957,55 +957,27 @@ def test_stopasgroup(self):
 
     def test_signal_from_stopped(self):
         options = DummyOptions()
-
-        killedpid = []
-        killedsig = []
-
-        def kill(pid, sig):
-            killedpid.append(pid)
-            killedsig.append(sig)
-
-        options.kill = kill #don't actually start killing random processes...
-
         config = DummyPConfig(options, 'test', '/test')
         instance = self._makeOne(config)
-        instance.pid = None
-
         from supervisor.states import ProcessStates
         instance.state = ProcessStates.STOPPED
-
-        instance.signal(signal.SIGWINCH )
-
+        instance.signal(signal.SIGWINCH)
         self.assertEqual(options.logger.data[0], "attempted to send test sig SIGWINCH "
-                                                    "but it wasn't running")
-
-        self.assertEqual(killedpid, [])
+                                                 "but it wasn't running")
+        self.assertEqual(len(options.kills), 0)
 
     def test_signal_from_running(self):
         options = DummyOptions()
-
-        killedpid = []
-        killedsig = []
-
-        def kill(pid, sig):
-            killedpid.append(pid)
-            killedsig.append(sig)
-
-        options.kill = kill
-
         config = DummyPConfig(options, 'test', '/test')
         instance = self._makeOne(config)
         instance.pid = 11
-
         from supervisor.states import ProcessStates
         instance.state = ProcessStates.RUNNING
-
-        instance.signal(signal.SIGWINCH )
-
-        self.assertEqual(killedpid, [instance.pid,])
-        self.assertEqual(killedsig, [signal.SIGWINCH,])
-
+        instance.signal(signal.SIGWINCH)
         self.assertEqual(options.logger.data[0], 'sending test (pid 11) sig SIGWINCH')
+        self.assertEqual(len(options.kills), 1)
+        self.assertTrue(instance.pid in options.kills)
+        self.assertEqual(options.kills[instance.pid], signal.SIGWINCH)
 
     def test_signal_from_running_error(self):
         options = DummyOptions()