Update cfs-tests

tests/__init__.py

@@ -7,8 +7,7 @@ from . import init_test, option_test, show_test, \
     ptrack_vacuum_bits_frozen, ptrack_vacuum_bits_visibility, \
     ptrack_vacuum_full, ptrack_vacuum_truncate, pgpro560, pgpro589, \
     false_positive, replica, compression, page, ptrack, archive, \
-    cfs_backup_noenc, cfs_backup_enc, cfs_restore_noenc, cfs_restore_enc, \
-    cfs_validate_backup
+    cfs_backup, cfs_restore
 
 
 def load_tests(loader, tests, pattern):
@@ -38,11 +37,8 @@ def load_tests(loader, tests, pattern):
     suite.addTests(loader.loadTestsFromModule(compression))
     suite.addTests(loader.loadTestsFromModule(page))
     suite.addTests(loader.loadTestsFromModule(archive))
-    suite.addTests(loader.loadTestsFromModule(cfs_backup_noenc))
-    suite.addTests(loader.loadTestsFromModule(cfs_backup_enc))
-    suite.addTests(loader.loadTestsFromModule(cfs_restore_noenc))
-    suite.addTests(loader.loadTestsFromModule(cfs_restore_enc))
-    suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
+    suite.addTests(loader.loadTestsFromModule(cfs_backup))
+    suite.addTests(loader.loadTestsFromModule(cfs_restore))
     return suite
 
 # ToDo:

tests/cfs_backup.py

@@ -5,7 +5,7 @@ import random
 from .helpers.cfs_helpers import find_by_extensions, find_by_name, find_by_pattern, corrupt_file
 from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
 
-module_name = 'cfs_backup_noenc'
+module_name = 'cfs_backup'
 tblspace_name = 'cfs_tblspace'
 
 
@@ -777,49 +777,14 @@ class CfsBackupNoEncTest(ProbackupTest, unittest.TestCase):
             self.backup_node,self.backup_dir, 'node', self.node, backup_type='full'
         )
 
-    # --- Validation backup --- #
-    # @unittest.expectedFailure
-    @unittest.skip("skip")
-    def test_delete_random_cfm_file_from_backup_dir(self):
-        pass
-
-    # @unittest.expectedFailure
-    # @unittest.skip("skip")
-    def test_delete_file_pg_compression_from_backup_dir(self):
-        self.backup_node(self.backup_dir, 'node', self.node, backup_type = 'full')
-        show_backup = self.show_pb(self.backup_dir,'node')[0]
-
-        self.assertEqual(
-            "OK",
-            show_backup["Status"],
-            "ERROR: Backup is not valid. \n Backup status: %s" % show_backup["Status"]
-        )
-
-        os.remove(find_by_name([os.path.join(self.backup_dir, 'backups', 'node', show_backup["ID"])], ['pg_compression'])[0])
-
-        self.assertRaises(ProbackupException, self.validate_pb, self.backup_dir, 'node')
-
-    # @unittest.expectedFailure
-    @unittest.skip("skip")
-    def test_delete_random_data_file_from_backup_dir(self):
-        pass
-
-    # @unittest.expectedFailure
-    @unittest.skip("skip")
-    def test_broken_random_cfm_file_into_backup_dir(self):
-        pass
-
-    # @unittest.expectedFailure
-    @unittest.skip("skip")
-    def test_broken_random_data_file_into_backup_dir(self):
-        pass
-
-    # @unittest.expectedFailure
-    @unittest.skip("skip")
-    def test_broken_file_pg_compression_into_backup_dir(self):
-        pass
-
     # --- End ---#
     def tearDown(self):
         self.node.cleanup()
         self.del_test_dir(module_name, self.fname)
+
+
+class CfsBackupEncTest(CfsBackupNoEncTest):
+    # --- Begin --- #
+    def setUp(self):
+        os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"
+        super(CfsBackupEncTest, self).setUp()

tests/cfs_backup_enc.py

@@ -1,13 +0,0 @@
-import os
-
-from .cfs_backup_noenc import CfsBackupNoEncTest
-
-module_name = 'cfs_backup_enc'
-tblspace_name = 'cfs_tblspace'
-
-
-class CfsBackupEncTest(CfsBackupNoEncTest):
-    # --- Begin --- #
-    def setUp(self):
-        os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"
-        super(CfsBackupEncTest, self).setUp()

tests/cfs_restore.py

@@ -16,9 +16,9 @@ from .helpers.cfs_helpers import find_by_name
 from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
 
 
-module_name = 'cfs_restore_noenc'
+module_name = 'cfs_restore'
 
-tblspace_name = 'cfs_tblspace_noenc'
+tblspace_name = 'cfs_tblspace'
 tblspace_name_new = 'cfs_tblspace_new'
 
 
@@ -132,7 +132,7 @@ class CfsRestoreNoencTest(CfsRestoreBase):
         """
         Case: Restore instance from valid full backup to old location.
         """
-        self.node.stop(['-m', 'immediate'])
+        self.node.stop()
         self.node.cleanup()
         shutil.rmtree(self.get_tblspace_path(self.node, tblspace_name))
 
@@ -145,6 +145,7 @@ class CfsRestoreNoencTest(CfsRestoreBase):
                     repr(e.message)
                 )
             )
+
         self.assertTrue(
             find_by_name([self.get_tblspace_path(self.node, tblspace_name)], ['pg_compression']),
             "ERROR: File pg_compression not found in tablespace dir"
@@ -435,3 +436,17 @@ class CfsRestoreNoencTest(CfsRestoreBase):
         Case: Restore from backup to new location, four jobs
         """
         pass
+
+
+class CfsRestoreEncEmptyTablespaceTest(CfsRestoreNoencEmptyTablespaceTest):
+    # --- Begin --- #
+    def setUp(self):
+        os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"
+        super(CfsRestoreNoencEmptyTablespaceTest, self).setUp()
+
+
+class CfsRestoreEncTest(CfsRestoreNoencTest):
+    # --- Begin --- #
+    def setUp(self):
+        os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"
+        super(CfsRestoreNoencTest, self).setUp()

tests/cfs_restore_enc.py

@@ -1,19 +0,0 @@
-import os
-
-from .cfs_restore_noenc import CfsRestoreNoencEmptyTablespaceTest,CfsRestoreNoencTest
-
-module_name = 'cfs_restore_enc'
-
-
-class CfsRestoreEncEmptyTablespaceTest(CfsRestoreNoencEmptyTablespaceTest):
-    # --- Begin --- #
-    def setUp(self):
-        os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"
-        super(CfsRestoreNoencEmptyTablespaceTest, self).setUp()
-
-
-class CfsRestoreEncTest(CfsRestoreNoencTest):
-    # --- Begin --- #
-    def setUp(self):
-        os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"
-        super(CfsRestoreNoencTest, self).setUp()