Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9d17c12

Browse files
committed
Add check parent backup.
1 parent 42a4d72 commit 9d17c12

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

tests/backup_test.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def test_backup_modes_1(self):
3131
backup_log.write(self.backup_pb(node, options=["--verbose"]))
3232

3333
show_backup = self.show_pb(node)[0]
34+
full_backup_id = show_backup.id
3435
self.assertEqual(show_backup.status, six.b("OK"))
3536
self.assertEqual(show_backup.mode, six.b("FULL"))
3637

@@ -42,6 +43,12 @@ def test_backup_modes_1(self):
4243
self.assertEqual(show_backup.status, six.b("OK"))
4344
self.assertEqual(show_backup.mode, six.b("PAGE"))
4445

46+
# Check parent backup
47+
self.assertEqual(
48+
full_backup_id,
49+
self.show_pb(node, show_backup.id)[six.b("PARENT_BACKUP")].strip(six.b(" '"))
50+
)
51+
4552
# ptrack backup mode
4653
if len(is_ptrack):
4754
with open(path.join(node.logs_dir, "backup_ptrack.log"), "wb") as backup_log:

tests/pb_lib.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,14 @@ def show_pb(self, node, id=None, options=[], as_text=False):
151151
# print(cmd_list)
152152
if as_text:
153153
return self.run_pb(options + cmd_list)
154-
else:
154+
elif id is None:
155155
return [ShowBackup(line.split()) for line in self.run_pb(options + cmd_list).splitlines()[3:]]
156+
else:
157+
return dict([
158+
line.split(six.b("="))
159+
for line in self.run_pb(options + cmd_list).splitlines()
160+
if line[0] != six.b("#")[0]
161+
])
156162

157163
def validate_pb(self, node, id, options=[]):
158164
cmd_list = [

0 commit comments

Comments
 (0)