Add failing tests for #1483

Author: mnaberez

supervisor/tests/fixtures/issue-1483a.conf

@@ -0,0 +1,11 @@
+[supervisord]
+loglevel=info                ; log level; default info; others: debug,warn,trace
+logfile=/tmp/issue-1483a.log ; main log file; default $CWD/supervisord.log
+pidfile=/tmp/issue-1483a.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-1483a.sock   ; the path to the socket file

supervisor/tests/fixtures/issue-1483b.conf

@@ -0,0 +1,12 @@
+[supervisord]
+loglevel=info                ; log level; default info; others: debug,warn,trace
+logfile=/tmp/issue-1483b.log ; main log file; default $CWD/supervisord.log
+pidfile=/tmp/issue-1483b.pid ; supervisord pidfile; default supervisord.pid
+nodaemon=true                ; start in foreground if true; default false
+identifier=from_config_file
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[unix_http_server]
+file=/tmp/issue-1483b.sock   ; the path to the socket file

supervisor/tests/fixtures/issue-1483c.conf

@@ -0,0 +1,12 @@
+[supervisord]
+loglevel=info                ; log level; default info; others: debug,warn,trace
+logfile=/tmp/issue-1483c.log ; main log file; default $CWD/supervisord.log
+pidfile=/tmp/issue-1483c.pid ; supervisord pidfile; default supervisord.pid
+nodaemon=true                ; start in foreground if true; default false
+identifier=from_config_file
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[unix_http_server]
+file=/tmp/issue-1483c.sock   ; the path to the socket file

supervisor/tests/test_end_to_end.py

@@ -363,6 +363,62 @@ def test_issue_1418_pidproxy_cmd_with_args(self):
         pidproxy.expect(pexpect.EOF)
         self.assertEqual(pidproxy.before.strip(), "1 2")
 
+    def test_issue_1483a_identifier_default(self):
+        """When no identifier is supplied on the command line or in the config
+        file, the default is used."""
+        filename = pkg_resources.resource_filename(__name__, 'fixtures/issue-1483a.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('supervisord started with pid')
+
+        from supervisor.compat import xmlrpclib
+        from supervisor.xmlrpc import SupervisorTransport
+        transport = SupervisorTransport('', '', 'unix:///tmp/issue-1483a.sock')
+        try:
+            server = xmlrpclib.ServerProxy('http://transport.ignores.host/RPC2', transport)
+            ident = server.supervisor.getIdentification()
+        finally:
+            transport.close()
+        self.assertEqual(ident, "supervisor")
+
+    def test_issue_1483b_identifier_from_config_file(self):
+        """When the identifier is supplied in the config file only, that
+        identifier is used instead of the default."""
+        filename = pkg_resources.resource_filename(__name__, 'fixtures/issue-1483b.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('supervisord started with pid')
+
+        from supervisor.compat import xmlrpclib
+        from supervisor.xmlrpc import SupervisorTransport
+        transport = SupervisorTransport('', '', 'unix:///tmp/issue-1483b.sock')
+        try:
+            server = xmlrpclib.ServerProxy('http://transport.ignores.host/RPC2', transport)
+            ident = server.supervisor.getIdentification()
+        finally:
+            transport.close()
+        self.assertEqual(ident, "from_config_file")
+
+    def test_issue_1483c_identifier_from_command_line(self):
+        """When an identifier is supplied in both the config file and on the
+        command line, the one from the command line is used."""
+        filename = pkg_resources.resource_filename(__name__, 'fixtures/issue-1483c.conf')
+        args = ['-m', 'supervisor.supervisord', '-c', filename, '-i', 'from_command_line']
+        supervisord = pexpect.spawn(sys.executable, args, encoding='utf-8')
+        self.addCleanup(supervisord.kill, signal.SIGINT)
+        supervisord.expect_exact('supervisord started with pid')
+
+        from supervisor.compat import xmlrpclib
+        from supervisor.xmlrpc import SupervisorTransport
+        transport = SupervisorTransport('', '', 'unix:///tmp/issue-1483c.sock')
+        try:
+            server = xmlrpclib.ServerProxy('http://transport.ignores.host/RPC2', transport)
+            ident = server.supervisor.getIdentification()
+        finally:
+            transport.close()
+        self.assertEqual(ident, "from_command_line")
 
 def test_suite():
     return unittest.findTestCases(sys.modules[__name__])

supervisor/tests/test_options.py

@@ -1153,6 +1153,16 @@ def record_usage(message):
         self.assertEqual(len(recorder), 1)
         self.assertEqual(recorder[0], "option --bad not recognized")
 
+    def test_realize_prefers_identifier_from_args(self):
+        text = lstrip("""
+        [supervisord]
+        identifier=from_config_file
+        """)
+        instance = self._makeOne()
+        instance.configfile = StringIO(text)
+        instance.realize(args=['-i', 'from_args'])
+        self.assertEqual(instance.identifier, "from_args")
+
     def test_options_afunix(self):
         instance = self._makeOne()
         text = lstrip("""\