Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8aeddc9

Browse files
committed
tests: minor fixes
1 parent9c83463 commit8aeddc9

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

‎tests/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def load_tests(loader, tests, pattern):
1818
# suite.addTests(loader.loadTestsFromModule(cfs_backup))
1919
# suite.addTests(loader.loadTestsFromModule(cfs_restore))
2020
# suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
21-
# suite.addTests(loader.loadTestsFromModule(logging))
21+
suite.addTests(loader.loadTestsFromModule(logging))
2222
suite.addTests(loader.loadTestsFromModule(compression))
2323
suite.addTests(loader.loadTestsFromModule(delete))
2424
suite.addTests(loader.loadTestsFromModule(delta))

‎tests/expected/option_help.out‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
3939
[--log-directory=log-directory]
4040
[--log-rotation-size=log-rotation-size]
4141
[--log-rotation-age=log-rotation-age]
42-
[--delete-expired] [--delete-wal]
42+
[--delete-expired] [--delete-wal] [--merge-expired]
4343
[--retention-redundancy=retention-redundancy]
4444
[--retention-window=retention-window]
4545
[--compress]
@@ -51,16 +51,19 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
5151
[--master-port=port] [--master-user=user_name]
5252
[--replica-timeout=timeout]
5353
[--skip-block-validation]
54+
[--external-dirs=external-directory-path]
5455

5556
pg_probackup restore -B backup-path --instance=instance_name
56-
[-D pgdata-path] [-i backup-id] [--progress]
57+
[-D pgdata-path] [-i backup-id] [-j num-threads]
5758
[--time=time|--xid=xid|--lsn=lsn [--inclusive=boolean]]
58-
[--timeline=timeline] [-T OLDDIR=NEWDIR]
59+
[--timeline=timeline] [-T OLDDIR=NEWDIR] [--progress]
60+
[--external-mapping=OLDDIR=NEWDIR]
5961
[--immediate] [--recovery-target-name=target-name]
6062
[--recovery-target-action=pause|promote|shutdown]
6163
[--restore-as-replica]
6264
[--no-validate]
6365
[--skip-block-validation]
66+
[--skip-external-dirs]
6467

6568
pg_probackup validate -B backup-path [--instance=instance_name]
6669
[-i backup-id] [--progress] [-j num-threads]
@@ -74,10 +77,11 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
7477
[--format=format]
7578

7679
pg_probackup delete -B backup-path --instance=instance_name
77-
[--wal] [-i backup-id | --expired]
80+
[--wal] [-i backup-id | --expired | --merge-expired]
81+
[--dry-run]
7882

7983
pg_probackup merge -B backup-path --instance=instance_name
80-
-i backup-id
84+
-i backup-id [--progress] [-j num-threads]
8185

8286
pg_probackup add-instance -B backup-path -D pgdata-path
8387
--instance=instance_name

‎tests/merge.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ def test_continue_failed_merge_with_corrupted_delta_backup(self):
11971197

11981198
deftest_continue_failed_merge_2(self):
11991199
"""
1200-
Check that failed MERGE on delete can`t be continued
1200+
Check that failed MERGE on delete can be continued
12011201
"""
12021202
fname=self.id().split('.')[3]
12031203
backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')
@@ -1253,6 +1253,8 @@ def test_continue_failed_merge_2(self):
12531253

12541254
backup_id_deleted=self.show_pb(backup_dir,"node")[1]["id"]
12551255

1256+
# TODO check that full backup has meta info is equal to DELETTING
1257+
12561258
# Try to continue failed MERGE
12571259
self.merge_backup(backup_dir,"node",backup_id)
12581260
# Clean after yourself

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp