Skip to content

Commit 52658bd

Browse files
committed
[PBCKP-259] dirty tests.backup.BackupTest.test_start_time_few_nodes_incorrect_time fix
1 parent c67b514 commit 52658bd

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tests/backup.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,9 +3684,9 @@ def test_start_time_few_nodes_incorrect_time(self):
36843684
"\n Output: {0} \n CMD: {1}".format(
36853685
repr(self.output), self.cmd))
36863686
except ProbackupException as e:
3687-
self.assertRegex(
3687+
self.assertIn(
3688+
"ERROR: Can't assign backup_id from requested start_time (7PS), this time must be later that backup",
36883689
e.message,
3689-
"ERROR: Cannot create directory for older backup",
36903690
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
36913691
repr(e.message), self.cmd))
36923692

@@ -3710,9 +3710,9 @@ def test_start_time_few_nodes_incorrect_time(self):
37103710
"\n Output: {0} \n CMD: {1}".format(
37113711
repr(self.output), self.cmd))
37123712
except ProbackupException as e:
3713-
self.assertRegex(
3713+
self.assertIn(
3714+
"ERROR: Can't assign backup_id from requested start_time (7PS), this time must be later that backup",
37143715
e.message,
3715-
"ERROR: Cannot create directory for older backup",
37163716
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
37173717
repr(e.message), self.cmd))
37183718

@@ -3722,15 +3722,14 @@ def test_start_time_few_nodes_incorrect_time(self):
37223722

37233723
# PTRACK backup
37243724
startTime = int(time())
3725-
if self.ptrack and node1.major_version > 11:
3725+
if self.ptrack:
37263726
node1.safe_psql(
37273727
"postgres",
37283728
"create extension ptrack")
37293729
self.backup_node(
37303730
backup_dir1, 'node1', node1, backup_type="ptrack",
37313731
options=['--stream', '--start-time', str(startTime)])
37323732

3733-
if self.ptrack and node2.major_version > 11:
37343733
node2.safe_psql(
37353734
"postgres",
37363735
"create extension ptrack")
@@ -3745,9 +3744,9 @@ def test_start_time_few_nodes_incorrect_time(self):
37453744
"\n Output: {0} \n CMD: {1}".format(
37463745
repr(self.output), self.cmd))
37473746
except ProbackupException as e:
3748-
self.assertRegex(
3747+
self.assertIn(
3748+
"ERROR: Can't assign backup_id from requested start_time (7PS), this time must be later that backup",
37493749
e.message,
3750-
"ERROR: Cannot create directory for older backup",
37513750
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
37523751
repr(e.message), self.cmd))
37533752

@@ -3760,7 +3759,8 @@ def test_start_time_few_nodes_incorrect_time(self):
37603759
backup_dir2, 'node2', node2, backup_type="full",
37613760
options=['--stream', '--start-time', str(startTime)])
37623761

3763-
show_backup1 = self.show_pb(backup_dir1, 'node1')[4]
3762+
show_backups_node1 = self.show_pb(backup_dir1, 'node1')
3763+
show_backup1 = show_backups_node1[len(show_backups_node1) - 1]
37643764
show_backup2 = self.show_pb(backup_dir2, 'node2')[1]
37653765
self.assertEqual(show_backup1['id'], show_backup2['id'])
37663766

0 commit comments

Comments
 (0)