|
13 | 13 | import shutil
|
14 | 14 |
|
15 | 15 | from .helpers.cfs_helpers import find_by_name
|
16 |
| -from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, is_test_result_ok |
17 |
| - |
18 |
| - |
19 |
| -module_name = 'cfs_restore' |
| 16 | +from .helpers.ptrack_helpers import ProbackupTest, ProbackupException |
20 | 17 |
|
21 | 18 | tblspace_name = 'cfs_tblspace'
|
22 | 19 | tblspace_name_new = 'cfs_tblspace_new'
|
23 | 20 |
|
24 | 21 |
|
25 | 22 | class CfsRestoreBase(ProbackupTest, unittest.TestCase):
|
26 | 23 | def setUp(self):
|
27 |
| - self.fname = self.id().split('.')[3] |
28 |
| - self.backup_dir = os.path.join(self.tmp_path, module_name, self.fname, 'backup') |
| 24 | + self.backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup') |
29 | 25 |
|
30 | 26 | self.node = self.make_simple_node(
|
31 |
| - base_dir="{0}/{1}/node".format(module_name, self.fname), |
| 27 | + base_dir="{0}/{1}/node".format(self.module_name, self.fname), |
32 | 28 | set_replication=True,
|
33 | 29 | initdb_params=['--data-checksums'],
|
34 | 30 | pg_options={
|
@@ -60,13 +56,6 @@ def setUp(self):
|
60 | 56 | def add_data_in_cluster(self):
|
61 | 57 | pass
|
62 | 58 |
|
63 |
| - @unittest.skipUnless(ProbackupTest.enterprise, 'skip') |
64 |
| - def tearDown(self): |
65 |
| - module_name = self.id().split('.')[1] |
66 |
| - fname = self.id().split('.')[3] |
67 |
| - if is_test_result_ok(self): |
68 |
| - self.del_test_dir(module_name, fname) |
69 |
| - |
70 | 59 |
|
71 | 60 | class CfsRestoreNoencEmptyTablespaceTest(CfsRestoreBase):
|
72 | 61 | # @unittest.expectedFailure
|
@@ -214,7 +203,7 @@ def test_restore_from_fullbackup_to_new_location(self):
|
214 | 203 | self.node.cleanup()
|
215 | 204 | shutil.rmtree(self.get_tblspace_path(self.node, tblspace_name))
|
216 | 205 |
|
217 |
| - node_new = self.make_simple_node(base_dir="{0}/{1}/node_new_location".format(module_name, self.fname)) |
| 206 | + node_new = self.make_simple_node(base_dir="{0}/{1}/node_new_location".format(self.module_name, self.fname)) |
218 | 207 | node_new.cleanup()
|
219 | 208 |
|
220 | 209 | try:
|
@@ -257,7 +246,7 @@ def test_restore_from_fullbackup_to_new_location_5_jobs(self):
|
257 | 246 | self.node.cleanup()
|
258 | 247 | shutil.rmtree(self.get_tblspace_path(self.node, tblspace_name))
|
259 | 248 |
|
260 |
| - node_new = self.make_simple_node(base_dir="{0}/{1}/node_new_location".format(module_name, self.fname)) |
| 249 | + node_new = self.make_simple_node(base_dir="{0}/{1}/node_new_location".format(self.module_name, self.fname)) |
261 | 250 | node_new.cleanup()
|
262 | 251 |
|
263 | 252 | try:
|
|
0 commit comments