8000 [PBCKP-304] extracted all cleanup routines to ptrack.py.TearDown() · postgrespro/pg_probackup@8000222 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8000222

Browse files
Ivan Lazarevavaness
Ivan Lazarev
authored and
avaness
committed
[PBCKP-304] extracted all cleanup routines to ptrack.py.TearDown()
1 parent f4d30e0 commit 8000222

34 files changed

+1318
-3301
lines changed

‎tests/CVE_2018_1058.py

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
import unittest
33
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
44

5-
module_name = 'CVE-2018-1058'
6-
75
class CVE_2018_1058(ProbackupTest, unittest.TestCase):
86

97
# @unittest.skip("skip")
108
def test_basic_default_search_path(self):
119
""""""
12-
fname = self.id().split('.')[3]
13-
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
10+
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')
1411
node = self.make_simple_node(
15-
base_dir=os.path.join(module_name, fname, 'node'),
12+
base_dir=os.path.join(self.module_name, self.fname, 'node'),
1613
set_replication=True)
1714

1815
self.init_pb(backup_dir)
@@ -31,16 +28,12 @@ def test_basic_default_search_path(self):
3128

3229
self.backup_node(backup_dir, 'node', node, backup_type='full', options=['--stream'])
3330

34-
# Clean after yourself
35-
self.del_test_dir(module_name, fname)
36-
3731
# @unittest.skip("skip")
3832
def test_basic_backup_modified_search_path(self):
3933
""""""
40-
fname = self.id().split('.')[3]
41-
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
34+
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')
4235
node = self.make_simple_node(
43-
base_dir=os.path.join(module_name, fname, 'node'),
36+
base_dir=os.path.join(self.module_name, self.fname, 'node'),
4437
set_replication=True)
4538
self.set_auto_conf(node, options={'search_path': 'public,pg_catalog'})
4639

@@ -77,15 +70,11 @@ def test_basic_backup_modified_search_path(self):
7770
self.assertFalse(
7871
'pg_probackup vulnerable!' in log_content)
7972

80-
# Clean after yourself
81-
self.del_test_dir(module_name, fname)
82-
8373
# @unittest.skip("skip")
8474
def test_basic_checkdb_modified_search_path(self):
8575
""""""
86-
fname = self.id().split('.')[3]
8776
node = self.make_simple_node(
88-
base_dir=os.path.join(module_name, fname, 'node'),
77+
base_dir=os.path.join(self.module_name, self.fname, 'node'),
8978
initdb_params=['--data-checksums'])
9079
self.set_auto_conf(node, options={'search_path': 'public,pg_catalog'})
9180
node.slow_start()
@@ -138,6 +127,3 @@ def test_basic_checkdb_modified_search_path(self):
138127
e.message,
139128
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
140129
repr(e.message), self.cmd))
141-
142-
# Clean after yourself
143-
self.del_test_dir(module_name, fname)

0 commit comments

Comments
 (0)
0