Add test for #986

Author: mnaberez

supervisor/tests/fixtures/issue-986.conf

@@ -0,0 +1,19 @@
+[supervisord]
+loglevel=debug               ; log level; default info; others: debug,warn,trace
+logfile=/tmp/issue-986.log   ; main log file; default $CWD/supervisord.log
+pidfile=/tmp/issue-986.pid   ; supervisord pidfile; default supervisord.pid
+nodaemon=true                ; start in foreground if true; default false
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[unix_http_server]
+file=/tmp/issue-986.sock   ; the path to the socket file
+
+[supervisorctl]
+serverurl=unix:///tmp/issue-986.sock  ; use a unix:// URL  for a unix socket
+
+[program:echo]
+command=bash -c "echo 'dhcrelay -d -q -a %%h:%%p %%P -i Vlan1000 192.168.0.1'"
+startsecs=0
+autorestart=false

supervisor/tests/test_end_to_end.py

@@ -151,6 +151,15 @@ def test_issue_836(self):
             seen = False
         self.assertTrue(seen)
 
+    def test_issue_986_command_string_with_double_percent(self):
+        """A percent sign can be used in a command= string without being
+        expanded if it is escaped by a second percent sign."""
+        filename = pkg_resources.resource_filename(__name__, 'fixtures/issue-986.conf')
+        args = ['-m', 'supervisor.supervisord', '-c', filename]
+        supervisord = pexpect.spawn(sys.executable, args, encoding='utf-8')
+        self.addCleanup(supervisord.kill, signal.SIGINT)
+        supervisord.expect_exact('dhcrelay -d -q -a %h:%p %P -i Vlan1000 192.168.0.1')
+
     def test_issue_1054(self):
         """When run on Python 3, the 'supervisorctl avail' command
         should work."""
@@ -320,7 +329,7 @@ def test_issue_1298(self):
         self.addCleanup(bash.kill, signal.SIGINT)
         bash.expect('spewage 2', timeout=30)
 
-    def test_issue_1481_pidproxy_cmd_with_no_args(self):
+    def test_issue_1418_pidproxy_cmd_with_no_args(self):
         """When pidproxy is given a command to run that has no arguments, it
         runs that command."""
         args = ['-m', 'supervisor.pidproxy', 'nonexistent-pidfile', "/bin/echo"]
@@ -329,7 +338,7 @@ def test_issue_1481_pidproxy_cmd_with_no_args(self):
         pidproxy.expect(pexpect.EOF)
         self.assertEqual(pidproxy.before.strip(), "")
 
-    def test_issue_1481_pidproxy_cmd_with_args(self):
+    def test_issue_1418_pidproxy_cmd_with_args(self):
         """When pidproxy is given a command to run that has arguments, it
         runs that command."""
         args = ['-m', 'supervisor.pidproxy', 'nonexistent-pidfile', "/bin/echo", "1", "2"]
@@ -338,6 +347,7 @@ def test_issue_1481_pidproxy_cmd_with_args(self):
         pidproxy.expect(pexpect.EOF)
         self.assertEqual(pidproxy.before.strip(), "1 2")
 
+
 def test_suite():
     return unittest.findTestCases(sys.modules[__name__])