Skip to content

Commit cfd1a72

Browse files
author
v.shepard
committed
Merge branch 'REL_2_5' into REL_2_6
2 parents de57172 + 0e1227b commit cfd1a72

39 files changed

+48
-48
lines changed

tests/CVE_2018_1058.py renamed to tests/CVE_2018_1058_test.py

File renamed without changes.

‎tests/__init__.py‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import unittest
22
import os
33

4-
from . import init, merge, option, show, compatibility, \
5-
backup, delete, delta, restore, validate, \
6-
retention, pgpro560, pgpro589, pgpro2068, false_positive, replica, \
7-
compression, page, ptrack, archive, exclude, cfs_backup, cfs_restore, \
8-
cfs_validate_backup, auth_test, time_stamp, logging, \
9-
locking, remote, external, config, checkdb, set_backup, incr_restore, \
10-
catchup, CVE_2018_1058, time_consuming
4+
from . import init_test, merge_test, option_test, show_test, compatibility_test, \
5+
backup_test, delete_test, delta_test, restore_test, validate_test, \
6+
retention_test, pgpro560_test, pgpro589_test, pgpro2068_test, false_positive_test, replica_test, \
7+
compression_test, page_test, ptrack_test, archive_test, exclude_test, cfs_backup_test, cfs_restore_test, \
8+
cfs_validate_backup_test, auth_test, time_stamp_test, logging_test, \
9+
locking_test, remote_test, external_test, config_test, checkdb_test, set_backup_test, incr_restore_test, \
10+
catchup_test, CVE_2018_1058_test, time_consuming_test
1111

1212

1313
def load_tests(loader, tests, pattern):
@@ -19,50 +19,50 @@ def load_tests(loader, tests, pattern):
1919

2020
if 'PG_PROBACKUP_PTRACK' in os.environ:
2121
if os.environ['PG_PROBACKUP_PTRACK'] == 'ON':
22-
suite.addTests(loader.loadTestsFromModule(ptrack))
22+
suite.addTests(loader.loadTestsFromModule(ptrack_test))
2323

2424
# PG_PROBACKUP_LONG section for tests that are long
2525
# by design e.g. they contain loops, sleeps and so on
2626
if 'PG_PROBACKUP_LONG' in os.environ:
2727
if os.environ['PG_PROBACKUP_LONG'] == 'ON':
28-
suite.addTests(loader.loadTestsFromModule(time_consuming))
28+
suite.addTests(loader.loadTestsFromModule(time_consuming_test))
2929

3030
suite.addTests(loader.loadTestsFromModule(auth_test))
31-
suite.addTests(loader.loadTestsFromModule(archive))
32-
suite.addTests(loader.loadTestsFromModule(backup))
33-
suite.addTests(loader.loadTestsFromModule(catchup))
31+
suite.addTests(loader.loadTestsFromModule(archive_test))
32+
suite.addTests(loader.loadTestsFromModule(backup_test))
33+
suite.addTests(loader.loadTestsFromModule(catchup_test))
3434
if 'PGPROBACKUPBIN_OLD' in os.environ and os.environ['PGPROBACKUPBIN_OLD']:
35-
suite.addTests(loader.loadTestsFromModule(compatibility))
36-
suite.addTests(loader.loadTestsFromModule(checkdb))
37-
suite.addTests(loader.loadTestsFromModule(config))
38-
suite.addTests(loader.loadTestsFromModule(cfs_backup))
39-
suite.addTests(loader.loadTestsFromModule(cfs_restore))
40-
suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
41-
suite.addTests(loader.loadTestsFromModule(compression))
42-
suite.addTests(loader.loadTestsFromModule(delete))
43-
suite.addTests(loader.loadTestsFromModule(delta))
44-
suite.addTests(loader.loadTestsFromModule(exclude))
45-
suite.addTests(loader.loadTestsFromModule(external))
46-
suite.addTests(loader.loadTestsFromModule(false_positive))
47-
suite.addTests(loader.loadTestsFromModule(init))
48-
suite.addTests(loader.loadTestsFromModule(incr_restore))
49-
suite.addTests(loader.loadTestsFromModule(locking))
50-
suite.addTests(loader.loadTestsFromModule(logging))
51-
suite.addTests(loader.loadTestsFromModule(merge))
52-
suite.addTests(loader.loadTestsFromModule(option))
53-
suite.addTests(loader.loadTestsFromModule(page))
54-
suite.addTests(loader.loadTestsFromModule(pgpro560))
55-
suite.addTests(loader.loadTestsFromModule(pgpro589))
56-
suite.addTests(loader.loadTestsFromModule(pgpro2068))
57-
suite.addTests(loader.loadTestsFromModule(remote))
58-
suite.addTests(loader.loadTestsFromModule(replica))
59-
suite.addTests(loader.loadTestsFromModule(restore))
60-
suite.addTests(loader.loadTestsFromModule(retention))
61-
suite.addTests(loader.loadTestsFromModule(set_backup))
62-
suite.addTests(loader.loadTestsFromModule(show))
63-
suite.addTests(loader.loadTestsFromModule(time_stamp))
64-
suite.addTests(loader.loadTestsFromModule(validate))
65-
suite.addTests(loader.loadTestsFromModule(CVE_2018_1058))
35+
suite.addTests(loader.loadTestsFromModule(compatibility_test))
36+
suite.addTests(loader.loadTestsFromModule(checkdb_test))
37+
suite.addTests(loader.loadTestsFromModule(config_test))
38+
suite.addTests(loader.loadTestsFromModule(cfs_backup_test))
39+
suite.addTests(loader.loadTestsFromModule(cfs_restore_test))
40+
suite.addTests(loader.loadTestsFromModule(cfs_validate_backup_test))
41+
suite.addTests(loader.loadTestsFromModule(compression_test))
42+
suite.addTests(loader.loadTestsFromModule(delete_test))
43+
suite.addTests(loader.loadTestsFromModule(delta_test))
44+
suite.addTests(loader.loadTestsFromModule(exclude_test))
45+
suite.addTests(loader.loadTestsFromModule(external_test))
46+
suite.addTests(loader.loadTestsFromModule(false_positive_test))
47+
suite.addTests(loader.loadTestsFromModule(init_test))
48+
suite.addTests(loader.loadTestsFromModule(incr_restore_test))
49+
suite.addTests(loader.loadTestsFromModule(locking_test))
50+
suite.addTests(loader.loadTestsFromModule(logging_test))
51+
suite.addTests(loader.loadTestsFromModule(merge_test))
52+
suite.addTests(loader.loadTestsFromModule(option_test))
53+
suite.addTests(loader.loadTestsFromModule(page_test))
54+
suite.addTests(loader.loadTestsFromModule(pgpro560_test))
55+
suite.addTests(loader.loadTestsFromModule(pgpro589_test))
56+
suite.addTests(loader.loadTestsFromModule(pgpro2068_test))
57+
suite.addTests(loader.loadTestsFromModule(remote_test))
58+
suite.addTests(loader.loadTestsFromModule(replica_test))
59+
suite.addTests(loader.loadTestsFromModule(restore_test))
60+
suite.addTests(loader.loadTestsFromModule(retention_test))
61+
suite.addTests(loader.loadTestsFromModule(set_backup_test))
62+
suite.addTests(loader.loadTestsFromModule(show_test))
63+
suite.addTests(loader.loadTestsFromModule(time_stamp_test))
64+
suite.addTests(loader.loadTestsFromModule(validate_test))
65+
suite.addTests(loader.loadTestsFromModule(CVE_2018_1058_test))
6666

6767
return suite
6868

tests/archive.py renamed to tests/archive_test.py

File renamed without changes.

tests/backup.py renamed to tests/backup_test.py

File renamed without changes.

tests/catchup.py renamed to tests/catchup_test.py

File renamed without changes.

tests/cfs_backup.py renamed to tests/cfs_backup_test.py

File renamed without changes.

tests/cfs_catchup.py renamed to tests/cfs_catchup_test.py

File renamed without changes.

tests/cfs_restore.py renamed to tests/cfs_restore_test.py

File renamed without changes.

tests/cfs_validate_backup.py renamed to tests/cfs_validate_backup_test.py

File renamed without changes.

tests/checkdb.py renamed to tests/checkdb_test.py

File renamed without changes.

0 commit comments

Comments
 (0)