8000 [PBCKP-304] missed self.module_name & self.fname fixes · postgrespro/pg_probackup@e3189e4 · GitHub
[go: up one dir, main page]
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
Appearance settings

Commit e3189e4

Browse files
author
Ivan Lazarev
committed
[PBCKP-304] missed self.module_name & self.fname fixes
1 parent 9924ab0 commit e3189e4

File tree

7 files changed

+7
-19
lines changed

7 files changed

+7
-19
lines changed

‎tests/cfs_catchup.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66
from .helpers.cfs_helpers import find_by_extensions, find_by_name, find_by_pattern, corrupt_file
77
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
88

9-
module_name = 'cfs_catchup'
10-
tblspace_name = 'cfs_tblspace'
11-
129

1310
class CfsCatchupNoEncTest(ProbackupTest, unittest.TestCase):
14-
def setUp(self):
15-
self.fname = self.id().split('.')[3]
1611

1712
@unittest.skipUnless(ProbackupTest.enterprise, 'skip')
1813
def test_full_catchup_with_tablespace(self):
@@ -21,7 +16,7 @@ def test_full_catchup_with_tablespace(self):
2116
"""
2217
# preparation
2318
src_pg = self.make_simple_node(
24-
base_dir = os.path.join(module_name, self.fname, 'src'),
19+
base_dir = os.path.join(self.module_name, self.fname, 'src'),
2520
set_replication = True
2621
)
2722
src_pg.slow_start()
@@ -36,7 +31,7 @@ def test_full_catchup_with_tablespace(self):
3631
"CHECKPOINT")
3732

3833
# do full catchup with tablespace mapping
39-
dst_pg = self.make_empty_node(os.path.join(module_name, self.fname, 'dst'))
34+
dst_pg = self.make_empty_node(os.path.join(self.module_name, self.fname, 'dst'))
4035
tblspace1_new_path = self.get_tblspace_path(dst_pg, 'tblspace1_new')
4136
self.catchup_node(
4237
backup_mode = 'FULL',
@@ -120,8 +115,3 @@ def test_full_catchup_with_tablespace(self):
120115
src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
121116
dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
122117
self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')
123-
124-
# Cleanup
125-
src_pg.stop()
126-
dst_pg.stop()
127-
self.del_test_dir(module_name, self.fname)

‎tests/cfs_validate_backup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from .helpers.cfs_helpers import find_by_extensions, find_by_name, find_by_pattern, corrupt_file
66
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
77

8-
module_name = 'cfs_validate_backup'
98
tblspace_name = 'cfs_tblspace'
109

1110

‎tests/delta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ def test_delta_pg_resetxlog(self):
11911191
# pgdata = self.pgdata_content(node.data_dir)
11921192
#
11931193
# node_restored = self.make_simple_node(
1194-
# base_dir=os.path.join(module_name, fname, 'node_restored'))
1194+
# base_dir=os.path.join(self.module_name, self.fname, 'node_restored'))
11951195
# node_restored.cleanup()
11961196
#
11971197
# self.restore_node(

‎tests/locking.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ def test_shared_lock(self):
579579
self._check_gdb_flag_or_skip_test()
580580

581581
node = self.make_simple_node(
582-
base_dir=os.path.join(self.module_name, self.name, 'node'),
582+
base_dir=os.path.join(self.module_name, self.fname, 'node'),
583583
initdb_params=['--data-checksums'])
584584

585585
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')

‎tests/page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ def test_page_pg_resetxlog(self):
14141414
# pgdata = self.pgdata_content(node.data_dir)
14151415
#
14161416
# node_restored = self.make_simple_node(
1417-
# base_dir=os.path.join(module_name, fname, 'node_restored'))
1417+
# base_dir=os.path.join(self.module_name, self.fname, 'node_restored'))
14181418
# node_restored.cleanup()
14191419
#
14201420
# self.restore_node(

‎tests/ptrack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4172,7 +4172,7 @@ def test_ptrack_pg_resetxlog(self):
41724172
# pgdata = self.pgdata_content(node.data_dir)
41734173
#
41744174
# node_restored = self.make_simple_node(
4175-
# base_dir=os.path.join(module_name, self.fname, 'node_restored'))
4175+
# base_dir=os.path.join(self.module_name, self.fname, 'node_restored'))
41764176
# node_restored.cleanup()
41774177
#
41784178
# self.restore_node(

‎tests/validate.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,13 +2789,12 @@ def test_validate_specific_backup_with_missing_backup(self):
27892789
PAGE1_1
27902790
FULL1
27912791
"""
2792-
fname = self.id().split('.')[3]
27932792
node = self.make_simple_node(
27942793
base_dir=os.path.join(self.module_name, self.fname, 'node'),
27952794
set_replication=True,
27962795
initdb_params=['--data-checksums'])
27972796

2798-
backup_dir = os.path.join(self.tmp_path, self.module_name, fname, 'backup')
2797+
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')
27992798
self.init_pb(backup_dir)
28002799
self.add_instance(backup_dir, 'node', node)
28012800
self.set_archiving(backup_dir, 'node', node)

0 commit comments

Comments
 (0)
0