Merge branch 'master' into remote_ssh

gsmolk · gsmolk · commit 0fded61269d2 · 2019-01-15T10:47:07.000+03:00
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -118,34 +118,26 @@ def __str__(self):
 def slow_start(self, replica=False):
 
     # wait for https://github.com/postgrespro/testgres/pull/50
-    # self.poll_query_until(
-    #    "postgres",
-    #    "SELECT not pg_is_in_recovery()",
-    #    raise_operational_error=False)
-
-    self.start()
+#    self.start()
+#    self.poll_query_until(
+#       "postgres",
+#       "SELECT not pg_is_in_recovery()",
+#       suppress={testgres.NodeConnection})
     if replica:
-        self.poll_query_until(
-            'postgres',
-            'SELECT pg_is_in_recovery()')
+        query = 'SELECT pg_is_in_recovery()'
     else:
-        while True:
-            try:
-                self.poll_query_until(
-                    'postgres',
-                    'SELECT not pg_is_in_recovery()')
+        query = 'SELECT not pg_is_in_recovery()'
+
+    self.start()
+    while True:
+        try:
+            if self.safe_psql('postgres', query) == 't\n':
                 break
-            except Exception as e:
+        except testgres.QueryException as e:
+            if 'database system is starting up' in e[0]:
                 continue
-
-#        while True:
-#            try:
-#                self.poll_query_until(
-#                    "postgres",
-#                    "SELECT pg_is_in_recovery()")
-#                break
-#            except ProbackupException as e:
-#                continue
+            else:
+                raise e
 
 
 class ProbackupTest(object):
