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

Commit7bfa61a

Browse files
committed
Update cfs-tests
1 parentdd14c27 commit7bfa61a

File tree

5 files changed

+29
-85
lines changed

5 files changed

+29
-85
lines changed

‎tests/__init__.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
ptrack_vacuum_bits_frozen,ptrack_vacuum_bits_visibility, \
88
ptrack_vacuum_full,ptrack_vacuum_truncate,pgpro560,pgpro589, \
99
false_positive,replica,compression,page,ptrack,archive, \
10-
cfs_backup_noenc,cfs_backup_enc,cfs_restore_noenc,cfs_restore_enc, \
11-
cfs_validate_backup
10+
cfs_backup,cfs_restore
1211

1312

1413
defload_tests(loader,tests,pattern):
@@ -38,11 +37,8 @@ def load_tests(loader, tests, pattern):
3837
suite.addTests(loader.loadTestsFromModule(compression))
3938
suite.addTests(loader.loadTestsFromModule(page))
4039
suite.addTests(loader.loadTestsFromModule(archive))
41-
suite.addTests(loader.loadTestsFromModule(cfs_backup_noenc))
42-
suite.addTests(loader.loadTestsFromModule(cfs_backup_enc))
43-
suite.addTests(loader.loadTestsFromModule(cfs_restore_noenc))
44-
suite.addTests(loader.loadTestsFromModule(cfs_restore_enc))
45-
suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
40+
suite.addTests(loader.loadTestsFromModule(cfs_backup))
41+
suite.addTests(loader.loadTestsFromModule(cfs_restore))
4642
returnsuite
4743

4844
# ToDo:

‎tests/cfs_backup_noenc.pyrenamed to‎tests/cfs_backup.py

Lines changed: 8 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .helpers.cfs_helpersimportfind_by_extensions,find_by_name,find_by_pattern,corrupt_file
66
from .helpers.ptrack_helpersimportProbackupTest,ProbackupException
77

8-
module_name='cfs_backup_noenc'
8+
module_name='cfs_backup'
99
tblspace_name='cfs_tblspace'
1010

1111

@@ -777,49 +777,14 @@ def test_broken_file_pg_compression_into_tablespace_dir(self):
777777
self.backup_node,self.backup_dir,'node',self.node,backup_type='full'
778778
)
779779

780-
# --- Validation backup --- #
781-
# @unittest.expectedFailure
782-
@unittest.skip("skip")
783-
deftest_delete_random_cfm_file_from_backup_dir(self):
784-
pass
785-
786-
# @unittest.expectedFailure
787-
# @unittest.skip("skip")
788-
deftest_delete_file_pg_compression_from_backup_dir(self):
789-
self.backup_node(self.backup_dir,'node',self.node,backup_type='full')
790-
show_backup=self.show_pb(self.backup_dir,'node')[0]
791-
792-
self.assertEqual(
793-
"OK",
794-
show_backup["Status"],
795-
"ERROR: Backup is not valid.\n Backup status: %s"%show_backup["Status"]
796-
)
797-
798-
os.remove(find_by_name([os.path.join(self.backup_dir,'backups','node',show_backup["ID"])], ['pg_compression'])[0])
799-
800-
self.assertRaises(ProbackupException,self.validate_pb,self.backup_dir,'node')
801-
802-
# @unittest.expectedFailure
803-
@unittest.skip("skip")
804-
deftest_delete_random_data_file_from_backup_dir(self):
805-
pass
806-
807-
# @unittest.expectedFailure
808-
@unittest.skip("skip")
809-
deftest_broken_random_cfm_file_into_backup_dir(self):
810-
pass
811-
812-
# @unittest.expectedFailure
813-
@unittest.skip("skip")
814-
deftest_broken_random_data_file_into_backup_dir(self):
815-
pass
816-
817-
# @unittest.expectedFailure
818-
@unittest.skip("skip")
819-
deftest_broken_file_pg_compression_into_backup_dir(self):
820-
pass
821-
822780
# --- End ---#
823781
deftearDown(self):
824782
self.node.cleanup()
825783
self.del_test_dir(module_name,self.fname)
784+
785+
786+
classCfsBackupEncTest(CfsBackupNoEncTest):
787+
# --- Begin --- #
788+
defsetUp(self):
789+
os.environ["PG_CIPHER_KEY"]="super_secret_cipher_key"
790+
super(CfsBackupEncTest,self).setUp()

‎tests/cfs_backup_enc.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎tests/cfs_restore_noenc.pyrenamed to‎tests/cfs_restore.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
from .helpers.ptrack_helpersimportProbackupTest,ProbackupException
1717

1818

19-
module_name='cfs_restore_noenc'
19+
module_name='cfs_restore'
2020

21-
tblspace_name='cfs_tblspace_noenc'
21+
tblspace_name='cfs_tblspace'
2222
tblspace_name_new='cfs_tblspace_new'
2323

2424

@@ -132,7 +132,7 @@ def test_restore_from_fullbackup_to_old_location(self):
132132
"""
133133
Case: Restore instance from valid full backup to old location.
134134
"""
135-
self.node.stop(['-m','immediate'])
135+
self.node.stop()
136136
self.node.cleanup()
137137
shutil.rmtree(self.get_tblspace_path(self.node,tblspace_name))
138138

@@ -145,6 +145,7 @@ def test_restore_from_fullbackup_to_old_location(self):
145145
repr(e.message)
146146
)
147147
)
148+
148149
self.assertTrue(
149150
find_by_name([self.get_tblspace_path(self.node,tblspace_name)], ['pg_compression']),
150151
"ERROR: File pg_compression not found in tablespace dir"
@@ -435,3 +436,17 @@ def test_restore_from_page_new_jobs(self):
435436
Case: Restore from backup to new location, four jobs
436437
"""
437438
pass
439+
440+
441+
classCfsRestoreEncEmptyTablespaceTest(CfsRestoreNoencEmptyTablespaceTest):
442+
# --- Begin --- #
443+
defsetUp(self):
444+
os.environ["PG_CIPHER_KEY"]="super_secret_cipher_key"
445+
super(CfsRestoreNoencEmptyTablespaceTest,self).setUp()
446+
447+
448+
classCfsRestoreEncTest(CfsRestoreNoencTest):
449+
# --- Begin --- #
450+
defsetUp(self):
451+
os.environ["PG_CIPHER_KEY"]="super_secret_cipher_key"
452+
super(CfsRestoreNoencTest,self).setUp()

‎tests/cfs_restore_enc.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

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