improve test_backup_simple(), set max_attempts=0 in poll_query_until() by default

Author: funbringer

testgres/testgres.py

@@ -915,7 +915,7 @@ def poll_query_until(self,
                          dbname,
                          query,
                          username=None,
-                         max_attempts=60,
+                         max_attempts=0,
                          sleep_time=1,
                          expected=True,
                          raise_programming_error=True,
@@ -1027,7 +1027,7 @@ def replicate(self, name, username=None,
         backup = self.backup(username=username, xlog_method=xlog_method)
         return backup.spawn_replica(name, use_logging=use_logging)
 
-    def catchup(self):
+    def catchup(self, username=None):
         """
         Wait until async replica catches up with its master.
         """
@@ -1049,7 +1049,10 @@ def catchup(self):
 
         try:
             lsn = master.execute('postgres', poll_lsn)[0][0]
-            self.poll_query_until('postgres', wait_lsn.format(lsn))
+            self.poll_query_until(dbname='postgres',
+                                  username=username,
+                                  query=wait_lsn.format(lsn),
+                                  max_attempts=0)  # infinite
         except Exception as e:
             raise CatchUpException(_explain_exception(e))
 

tests/test_simple.py

@@ -195,8 +195,18 @@ def test_control_data(self):
 
     def test_backup_simple(self):
         with get_new_node('master') as master:
-            master.init(allow_streaming=True).start()
 
+            # enable streaming for backups
+            master.init(allow_streaming=True)
+
+            # node must be running
+            with self.assertRaises(BackupException):
+                master.backup()
+
+            # it's time to start node
+            master.start()
+
+            # fill node with some data
             master.psql('postgres',
                         'create table test as select generate_series(1, 4) i')