Fix pidproxy with optional command args. Closes Supervisor#1418

Author: mnaberez

CHANGES.rst

@@ -1,5 +1,8 @@
-4.3.0 (Next Release)
---------------------
+4.3.0.dev0 (Next Release)
+-------------------------
+
+- Fixed a bug where ``pidproxy`` would not pass arguments to the command
+  it runs.
 
 4.2.2 (2021-02-26)
 ------------------

supervisor/pidproxy.py

@@ -18,16 +18,17 @@ class PidProxy:
     pid = None
 
     def __init__(self, args):
-        self.setsignals()
         try:
-            self.pidfile, cmdargs = args[1], args[2:]
-            self.command = os.path.abspath(cmdargs[0])
-            self.cmdargs = cmdargs
+            self.pidfile = args[1]
+            command_and_cmdargs = args[2:]
+            self.command = os.path.abspath(command_and_cmdargs[0])
+            self.cmdargs = command_and_cmdargs[1:]
         except (ValueError, IndexError):
             self.usage()
             sys.exit(1)
 
     def go(self):
+        self.setsignals()
         self.pid = os.spawnv(os.P_NOWAIT, self.command, self.cmdargs)
         while 1:
             time.sleep(5)

supervisor/tests/test_pidproxy.py

@@ -0,0 +1,17 @@
+import os
+import unittest
+
+class PidProxyTests(unittest.TestCase):
+    def _getTargetClass(self):
+        from supervisor.pidproxy import PidProxy
+        return PidProxy
+
+    def _makeOne(self, *arg, **kw):
+        return self._getTargetClass()(*arg, **kw)
+
+    def test_ctor_parses_args(self):
+        args = ["pidproxy.py", "/path/to/pidfile", "./cmd", "-arg1", "-arg2"]
+        pp = self._makeOne(args)
+        self.assertEqual(pp.pidfile, "/path/to/pidfile")
+        self.assertEqual(pp.command, os.path.abspath("./cmd"))
+        self.assertEqual(pp.cmdargs, ["-arg1", "-arg2"])