[Issue #369] fix tests

Author: gsmolk

tests/backup.py

@@ -149,13 +149,11 @@ def test_incremental_backup_without_full(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertTrue(
-                "WARNING: Valid backup on current timeline 1 is not found" in e.message and
+                "WARNING: Valid full backup on current timeline 1 is not found" in e.message and
                 "ERROR: Create new full backup before an incremental one" in e.message,
                 "\n Unexpected Error Message: {0}\n CMD: {1}".format(
                     repr(e.message), self.cmd))
 
-        sleep(1)
-
         try:
             self.backup_node(backup_dir, 'node', node, backup_type="ptrack")
             # we should die here because exception is what we expect to happen
@@ -166,7 +164,7 @@ def test_incremental_backup_without_full(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertTrue(
-                "WARNING: Valid backup on current timeline 1 is not found" in e.message and
+                "WARNING: Valid full backup on current timeline 1 is not found" in e.message and
                 "ERROR: Create new full backup before an incremental one" in e.message,
                 "\n Unexpected Error Message: {0}\n CMD: {1}".format(
                     repr(e.message), self.cmd))
@@ -230,7 +228,7 @@ def test_incremental_backup_corrupt_full(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertTrue(
-                "WARNING: Valid backup on current timeline 1 is not found" in e.message and
+                "WARNING: Valid full backup on current timeline 1 is not found" in e.message and
                 "ERROR: Create new full backup before an incremental one" in e.message,
                 "\n Unexpected Error Message: {0}\n CMD: {1}".format(
                     repr(e.message), self.cmd))
@@ -2352,7 +2350,7 @@ def test_parent_choosing_2(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertTrue(
-                'WARNING: Valid backup on current timeline 1 is not found' in e.message and
+                'WARNING: Valid full backup on current timeline 1 is not found' in e.message and
                 'ERROR: Create new full backup before an incremental one' in e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
@@ -3404,7 +3402,7 @@ def test_missing_replication_permission_1(self):
             return_id=False)
 
         self.assertIn(
-            'WARNING: Valid backup on current timeline 2 is not found, trying to look up on previous timelines',
+            'WARNING: Valid full backup on current timeline 2 is not found, trying to look up on previous timelines',
             output)
 
         self.assertIn(

tests/false_positive.py

@@ -83,12 +83,10 @@ def test_incremental_backup_corrupt_full_1(self):
         except ProbackupException as e:
             self.assertEqual(
                 e.message,
-                'ERROR: Valid backup on current timeline is not found. '
+                'ERROR: Valid full backup on current timeline is not found. '
                 'Create new FULL backup before an incremental one.\n',
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
-
-            sleep(1)
             self.assertFalse(
                 True,
                 "Expecting Error because page backup should not be "
@@ -98,7 +96,7 @@ def test_incremental_backup_corrupt_full_1(self):
         except ProbackupException as e:
             self.assertEqual(
                 e.message,
-                'ERROR: Valid backup on current timeline is not found. '
+                'ERROR: Valid full backup on current timeline is not found. '
                 'Create new FULL backup before an incremental one.\n',
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))

tests/retention.py

@@ -1712,7 +1712,7 @@ def test_wal_purge_victim(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertTrue(
-                "WARNING: Valid backup on current timeline 1 is not found" in e.message and
+                "WARNING: Valid full backup on current timeline 1 is not found" in e.message and
                 "ERROR: Create new full backup before an incremental one" in e.message,
                 "\n Unexpected Error Message: {0}\n CMD: {1}".format(
                     repr(e.message), self.cmd))