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

Commit04541c5

Browse files
committed
tests: final Windows fixes
1 parent613a5b3 commit04541c5

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed

‎tests/Readme.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
[см wiki](https://confluence.postgrespro.ru/display/DEV/pg_probackup)
22

33
```
4-
Note: For now there are tests only for Linix
4+
Note: For now these are works on Linix and "kinda" works on Windows
5+
```
6+
7+
```
8+
Windows Note: For tablespaceses tests to work on Windows, you should explicitly(!) grant current user full access to tmp_dirs
59
```
610

711

‎tests/__init__.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
importunittest
22

3-
from .importinit_test,merge,option_test,show_test,compatibility, \
3+
from .importinit,merge,option,show,compatibility, \
44
backup_test,delete,delta,restore,validate, \
55
retention,pgpro560,pgpro589,pgpro2068,false_positive,replica, \
66
compression,page,ptrack,archive,exclude,cfs_backup,cfs_restore, \
@@ -19,40 +19,36 @@ def load_tests(loader, tests, pattern):
1919
# suite.addTests(loader.loadTestsFromModule(cfs_backup))
2020
# suite.addTests(loader.loadTestsFromModule(cfs_restore))
2121
# suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
22-
suite.addTests(loader.loadTestsFromModule(logging))
2322
suite.addTests(loader.loadTestsFromModule(compression))
2423
suite.addTests(loader.loadTestsFromModule(delete))
2524
suite.addTests(loader.loadTestsFromModule(delta))
2625
suite.addTests(loader.loadTestsFromModule(exclude))
26+
suite.addTests(loader.loadTestsFromModule(external))
2727
suite.addTests(loader.loadTestsFromModule(false_positive))
28-
suite.addTests(loader.loadTestsFromModule(init_test))
28+
suite.addTests(loader.loadTestsFromModule(init))
2929
suite.addTests(loader.loadTestsFromModule(locking))
3030
suite.addTests(loader.loadTestsFromModule(logging))
3131
suite.addTests(loader.loadTestsFromModule(merge))
32-
suite.addTests(loader.loadTestsFromModule(option_test))
32+
suite.addTests(loader.loadTestsFromModule(option))
3333
suite.addTests(loader.loadTestsFromModule(page))
3434
# suite.addTests(loader.loadTestsFromModule(ptrack))
35+
suite.addTests(loader.loadTestsFromModule(pgpro560))
36+
suite.addTests(loader.loadTestsFromModule(pgpro589))
37+
suite.addTests(loader.loadTestsFromModule(pgpro2068))
3538
suite.addTests(loader.loadTestsFromModule(remote))
3639
suite.addTests(loader.loadTestsFromModule(replica))
3740
suite.addTests(loader.loadTestsFromModule(restore))
3841
suite.addTests(loader.loadTestsFromModule(retention))
39-
suite.addTests(loader.loadTestsFromModule(show_test))
42+
suite.addTests(loader.loadTestsFromModule(show))
4043
suite.addTests(loader.loadTestsFromModule(snapfs))
41-
suite.addTests(loader.loadTestsFromModule(validate))
42-
suite.addTests(loader.loadTestsFromModule(pgpro560))
43-
suite.addTests(loader.loadTestsFromModule(pgpro589))
44-
suite.addTests(loader.loadTestsFromModule(pgpro2068))
4544
suite.addTests(loader.loadTestsFromModule(time_stamp))
46-
suite.addTests(loader.loadTestsFromModule(external))
45+
suite.addTests(loader.loadTestsFromModule(validate))
4746

4847
returnsuite
4948

5049
# test_pgpro434_2 unexpected success
5150
# ToDo:
52-
# archive:
53-
# discrepancy of instance`s SYSTEMID and node`s SYSTEMID should lead to archive-push refusal to work
5451
# logging:
55-
# https://jira.postgrespro.ru/browse/PGPRO-584
5652
# https://jira.postgrespro.ru/secure/attachment/20420/20420_doc_logging.md
5753
# archive:
5854
# immediate recovery and full recovery

‎tests/exclude.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ def test_exclude_unlogged_tables_1(self):
112112
set_replication=True,
113113
initdb_params=['--data-checksums'],
114114
pg_options={
115-
'max_wal_senders':'2',
115+
'autovacuum':'off',
116116
"shared_buffers":"10MB",
117-
"fsync":"off",
118117
'ptrack_enable':'on'})
119118

120119
self.init_pb(backup_dir)

‎tests/logging.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def test_garbage_in_rotation_file(self):
256256
self.assertTrue(os.path.isfile(rotation_file_path))
257257

258258
# mangle .rotation file
259-
withopen(rotation_file_path,"wtb",0)asf:
259+
withopen(rotation_file_path,"wt",0)asf:
260260
f.write(b"blah")
261261
f.flush()
262262
f.close
@@ -274,8 +274,11 @@ def test_garbage_in_rotation_file(self):
274274
log_file_size)
275275

276276
self.assertIn(
277-
'WARNING: rotation file "{0}" has wrong '
278-
'creation timestamp'.format(rotation_file_path),
277+
'WARNING: rotation file',
278+
output)
279+
280+
self.assertIn(
281+
'has wrong creation timestamp',
279282
output)
280283

281284
self.assertTrue(os.path.isfile(rotation_file_path))

‎tests/merge.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,8 @@ def test_continue_failed_merge_2(self):
12241224

12251225
gdb=self.merge_backup(backup_dir,"node",backup_id,gdb=True)
12261226

1227-
gdb.set_breakpoint('fio_unlink')
1227+
gdb.set_breakpoint('pgFileDelete')
1228+
12281229
gdb.run_until_break()
12291230

12301231
gdb.continue_execution_until_break(20)

0 commit comments

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