Skip to content

Commit 8972d4f

Browse files
gsmolkgsmolk
committed
minor fixes
1 parent fa1ba6c commit 8972d4f

File tree

8 files changed

+18
-78
lines changed

8 files changed

+18
-78
lines changed

‎tests/class_check.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎tests/class_check1.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎tests/class_check2.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎tests/expected/option_help.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
pg_probackup - utility to manage backup/recovery of PostgreSQL database.
33

4-
pg_probackup help
4+
pg_probackup help [COMMAND]
55

66
pg_probackup version
77

@@ -21,20 +21,20 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
2121
[-d dbname] [-h host] [-p port] [-U username]
2222

2323
pg_probackup restore -B backup-dir
24-
[-D pgdata-dir] [-i backup-id]
24+
[-D pgdata-dir] [-i backup-id] [--progress] [-q] [-v]
2525
[--time=time|--xid=xid [--inclusive=boolean]]
2626
[--timeline=timeline] [-T OLDDIR=NEWDIR]
2727

2828
pg_probackup validate -B backup-dir
29-
[-D pgdata-dir] [-i backup-id]
29+
[-D pgdata-dir] [-i backup-id] [--progress] [-q] [-v]
3030
[--time=time|--xid=xid [--inclusive=boolean]]
31-
[--timeline=timeline] [-T OLDDIR=NEWDIR]
31+
[--timeline=timeline]
3232

3333
pg_probackup show -B backup-dir
3434
[-i backup-id]
3535

3636
pg_probackup delete -B backup-dir
37-
[--wal] [-i backup-id | --expired] [--force]
37+
[--wal] [-i backup-id | --expired]
3838

3939
Read the website for details. <https://github.com/postgrespro/pg_probackup>
4040
Report bugs to <https://github.com/postgrespro/pg_probackup/issues>.

‎tests/pgpro561.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@
88
from sys import exit
99

1010

11-
class SomeTest(ProbackupTest, unittest.TestCase):
11+
class CommonArchiveDir(ProbackupTest, unittest.TestCase):
1212

1313
def __init__(self, *args, **kwargs):
14-
super(SomeTest, self).__init__(*args, **kwargs)
14+
super(CommonArchiveDir, self).__init__(*args, **kwargs)
1515

1616
# @classmethod
1717
# def tearDownClass(cls):
1818
# stop_all()
1919

2020
def test_pgpro561(self):
2121
"""
22-
make node with archiving, make stream backup,
23-
get Recovery Time, try to make pitr to Recovery Time
22+
make node with archiving, make backup,
23+
restore it to node1 and node2, compare timelines
24+
EXPECT TO FAIL
2425
"""
2526
fname = self.id().split('.')[3]
2627
master = self.make_simple_node(base_dir="tmp_dirs/pgpro561/{0}/master".format(fname),

‎tests/pgpro668.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
from sys import exit
99

1010

11-
class SomeTest(ProbackupTest, unittest.TestCase):
11+
class RecoveryWithTimeTarget(ProbackupTest, unittest.TestCase):
1212

1313
def __init__(self, *args, **kwargs):
14-
super(SomeTest, self).__init__(*args, **kwargs)
14+
super(RecoveryWithTimeTarget, self).__init__(*args, **kwargs)
1515

1616
# @classmethod
1717
# def tearDownClass(cls):
@@ -46,7 +46,8 @@ def test_validate_to_recovery_time(self):
4646
"""
4747
make node with archiving, make stream backup,
4848
get Recovery Time, validate to Recovery Time
49-
Should fail. Waiting PGPRO-688
49+
EXPECT VALIDATE TO FAIL
50+
Waiting PGPRO-688
5051
"""
5152
fname = self.id().split('.')[3]
5253
node = self.make_simple_node(base_dir="tmp_dirs/pgpro668/{0}".format(fname),

‎tests/ptrack_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def check_ptrack_clean(self, idx_dict, size):
294294

295295
def run_pb(self, command):
296296
try:
297-
print [self.probackup_path] + command
297+
# print [self.probackup_path] + command
298298
output = subprocess.check_output(
299299
[self.probackup_path] + command,
300300
stderr=subprocess.STDOUT,

‎tests/validate_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs):
2222

2323
# @unittest.skip("123")
2424
def test_validate_time(self):
25-
"""recovery to latest from full backup"""
25+
"""recovery to latest from full backup. Expect to Fail"""
2626
fname = self.id().split('.')[3]
2727
node = self.make_simple_node(base_dir="tmp_dirs/validate/{0}".format(fname),
2828
set_archiving=True,
@@ -204,7 +204,7 @@ def test_validate_wal_lost_segment_1(self):
204204

205205
# @unittest.skip("123")
206206
def test_validate_wal_lost_segment_2(self):
207-
"""Loose segment located between backups """
207+
"""Loose segment located between backups. Expect to fail """
208208
fname = self.id().split('.')[3]
209209
node = self.make_simple_node(base_dir="tmp_dirs/validate/{0}".format(fname),
210210
set_archiving=True,
@@ -235,7 +235,7 @@ def test_validate_wal_lost_segment_2(self):
235235
wals = map(int, wals)
236236

237237
# delete last wal segment
238-
print os.path.join(self.backup_dir(node), "wal", '0000000' + str(max(wals)))
238+
#print os.path.join(self.backup_dir(node), "wal", '0000000' + str(max(wals)))
239239
os.remove(os.path.join(self.backup_dir(node), "wal", '0000000' + str(max(wals))))
240240

241241
# Need more accurate error message about loosing wal segment between backups

0 commit comments

Comments
 (0)