10000 [Issue #369] fix tests · postgrespro/pg_probackup@b14dda4 · GitHub
[go: up one dir, main page]
Skip to content

Commit b14dda4

Browse files
gsmolkgsmolk
committed
[Issue #369] fix tests
1 parent 36f21a9 commit b14dda4

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

‎tests/backup.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,11 @@ def test_incremental_backup_without_full(self):
149149
repr(self.output), self.cmd))
150150
except ProbackupException as e:
151151
self.assertTrue(
152-
"WARNING: Valid backup on current timeline 1 is not found" in e.message and
152+
"WARNING: Valid full backup on current timeline 1 is not found" in e.message and
153153
"ERROR: Create new full backup before an incremental one" in e.message,
154154
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
155155
repr(e.message), self.cmd))
156156

157-
sleep(1)
158-
159157
try:
160158
self.backup_node(backup_dir, 'node', node, backup_type="ptrack")
161159
# we should die here because exception is what we expect to happen
@@ -166,7 +164,7 @@ def test_incremental_backup_without_full(self):
166164
repr(self.output), self.cmd))
167165
except ProbackupException as e:
168166
self.assertTrue(
169-
"WARNING: Valid backup on current timeline 1 is not found" in e.message and
167+
"WARNING: Valid full backup on current timeline 1 is not found" in e.message and
170168
"ERROR: Create new full backup before an incremental one" in e.message,
171169
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
172170
repr(e.message), self.cmd))
@@ -230,7 +228,7 @@ def test_incremental_backup_corrupt_full(self):
230228
repr(self.output), self.cmd))
231229
except ProbackupException as e:
232230
self.assertTrue(
233-
"WARNING: Valid backup on current timeline 1 is not found" in e.message and
231+
"WARNING: Valid full backup on current timeline 1 is not found" in e.message and
234232
"ERROR: Create new full backup before an incremental one" in e.message,
235233
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
236234
repr(e.message), self.cmd))
@@ -2352,7 +2350,7 @@ def test_parent_choosing_2(self):
23522350
repr(self.output), self.cmd))
23532351
except ProbackupException as e:
23542352
self.assertTrue(
2355-
'WARNING: Valid backup on current timeline 1 is not found' in e.message and
2353+
'WARNING: Valid full backup on current timeline 1 is not found' in e.message and
23562354
'ERROR: Create new full backup before an incremental one' in e.message,
23572355
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
23582356
repr(e.message), self.cmd))
@@ -3404,7 +3402,7 @@ def test_missing_replication_permission_1(self):
34043402
return_id=False)
34053403

34063404
self.assertIn(
3407-
'WARNING: Valid backup on current timeline 2 is not found, trying to look up on previous timelines',
3405+
'WARNING: Valid full backup on current timeline 2 is not found, trying to look up on previous timelines',
34083406
output)
34093407

34103408
self.assertIn(

‎tests/false_positive.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,10 @@ def test_incremental_backup_corrupt_full_1(self):
8383
except ProbackupException as e:
8484
self.assertEqual(
8585
e.message,
86-
'ERROR: Valid backup on current timeline is not found. '
86+
'ERROR: Valid full backup on current timeline is not found. '
8787
'Create new FULL backup before an incremental one.\n',
8888
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
8989
repr(e.message), self.cmd))
90-
91-
sleep(1)
9290
self.assertFalse(
9391
True,
9492
"Expecting Error because page backup should not be "
@@ -98,7 +96,7 @@ def test_incremental_backup_corrupt_full_1(self):
9896
except ProbackupException as e:
9997
self.assertEqual(
10098
e.message,
101-
'ERROR: Valid backup on current timeline is not found. '
99+
'ERROR: Valid full backup on current timeline is not found. '
102100
'Create new FULL backup before an incremental one.\n',
103101
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
104102
repr(e.message), self.cmd))

‎tests/retention.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ def test_wal_purge_victim(self):
17121712
repr(self.output), self.cmd))
17131713
except ProbackupException as e:
17141714
self.assertTrue(
1715-
"WARNING: Valid backup on current timeline 1 is not found" in e.message and
1715+
"WARNING: Valid full backup on current timeline 1 is not found" in e.message and
17161716
"ERROR: Create new full backup before an incremental one" in e.message,
17171717
"\n Unexpected Error Message: {0}\n CMD: {1 3E6C }".format(
17181718
repr(e.message), self.cmd))

0 commit comments

Comments
 (0)
0