Add instance names for 9.6 and 10

Author: ildus

testgres/node.py

@@ -479,7 +479,7 @@ def get_auxiliary_pids(self):
 
         result = {}
         for child in children:
-            line = child.cmdline()[0]
+            line = ' '.join(child.cmdline())
             for ptype in ProcessType:
                 if ptype == ProcessType.WalSender \
                         and (line.startswith(ptype.value) or
@@ -513,8 +513,10 @@ def get_walsender_pid(self):
         for name, client_port in self._master.execute(sql):
             if name == self.name:
                 for child in children:
-                    line = child.cmdline()[0]
-                    if line.startswith('postgres: walsender') and str(client_port) in line:
+                    line = ' '.join(child.cmdline())
+                    if (line.startswith(ProcessType.WalSender.value) or
+                        line.startswith('postgres: wal sender')) and \
+                            str(client_port) in line:
                         return child.pid
 
         return None

tests/test_simple.py

@@ -709,15 +709,17 @@ def test_pids(self):
         except ImportError:
             psutil = None
 
-        master_processes = (
+        master_processes = [
             ProcessType.Checkpointer,
             ProcessType.BackgroundWriter,
             ProcessType.WalWriter,
             ProcessType.AutovacuumLauncher,
             ProcessType.StatsCollector,
-            ProcessType.LogicalReplicationLauncher,
             ProcessType.WalSender,
-        )
+        ]
+        if pg_version_ge('10'):
+            master_processes.append(ProcessType.LogicalReplicationLauncher)
+
         repl_processes = (
             ProcessType.Startup,
             ProcessType.Checkpointer,