minor fixes to ProcessProxy

Author: funbringer

testgres/node.py

@@ -80,10 +80,8 @@ def __init__(self, process):
     def __getattr__(self, name):
         return getattr(self.process, name)
 
-    def __str__(self):
-        pid = self.process.pid
-        cmdline = ' '.join(self.process.cmdline()).strip()
-        return '{} [{}]'.format(cmdline, pid)
+    def __repr__(self):
+        return '{} : {}'.format(str(self.ptype), repr(self.process))
 
 
 class PostgresNode(object):
@@ -219,7 +217,8 @@ def source_walsender(self):
                     if child.pid == int(row[0]):
                         return child
 
-        raise QueryException("Master doesn't send WAL to {}", self.name)
+        msg = "Master doesn't send WAL to {}".format(self.name)
+        raise TestgresException(msg)
 
     @property
     def master(self):
@@ -968,7 +967,7 @@ def catchup(self, dbname=None, username=None):
         """
 
         if not self.master:
-            raise CatchUpException("Node doesn't have a master")
+            raise TestgresException("Node doesn't have a master")
 
         if pg_version_ge('10'):
             poll_lsn = "select pg_current_wal_lsn()::text"

tests/test_simple.py

@@ -20,7 +20,6 @@
     ExecUtilException, \
     BackupException, \
     QueryException, \
-    CatchUpException, \
     TimeoutException, \
     TestgresException
 
@@ -397,7 +396,7 @@ def test_incorrect_catchup(self):
             node.init(allow_streaming=True).start()
 
             # node has no master, can't catch up
-            with self.assertRaises(CatchUpException):
+            with self.assertRaises(TestgresException):
                 node.catchup()
 
     def test_dump(self):
@@ -759,7 +758,7 @@ def test_child_pids(self):
                 replica.stop()
 
                 # there should be no walsender after we've stopped replica
-                with self.assertRaises(QueryException):
+                with self.assertRaises(TestgresException):
                     replica.source_walsender