[PBCKP-304] cfs tests moved back to build

Author: Ivan Lazarev

tests/__init__.py

@@ -35,9 +35,9 @@ def load_tests(loader, tests, pattern):
         suite.addTests(loader.loadTestsFromModule(compatibility))
     suite.addTests(loader.loadTestsFromModule(checkdb))
     suite.addTests(loader.loadTestsFromModule(config))
-#    suite.addTests(loader.loadTestsFromModule(cfs_backup))
-#    suite.addTests(loader.loadTestsFromModule(cfs_restore))
-#    suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
+    suite.addTests(loader.loadTestsFromModule(cfs_backup))
+    suite.addTests(loader.loadTestsFromModule(cfs_restore))
+    suite.addTests(loader.loadTestsFromModule(cfs_validate_backup))
     suite.addTests(loader.loadTestsFromModule(compression))
     suite.addTests(loader.loadTestsFromModule(delete))
     suite.addTests(loader.loadTestsFromModule(delta))

tests/cfs_backup.py

@@ -4,7 +4,7 @@
 import shutil
 
 from .helpers.cfs_helpers import find_by_extensions, find_by_name, find_by_pattern, corrupt_file
-from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, is_test_result_ok
 
 module_name = 'cfs_backup'
 tblspace_name = 'cfs_tblspace'
@@ -1159,10 +1159,12 @@ def test_broken_file_pg_compression_into_tablespace_dir(self):
         )
 
 #    # --- End ---#
-#    @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
-#    def tearDown(self):
-#        self.node.cleanup()
-#        self.del_test_dir(module_name, self.fname)
+    @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
+    def tearDown(self):
+        module_name = self.id().split('.')[1]
+        fname = self.id().split('.')[3]
+        if is_test_result_ok(self):
+            self.del_test_dir(module_name, fname)
 
 
 #class CfsBackupEncTest(CfsBackupNoEncTest):

tests/cfs_restore.py

@@ -13,7 +13,7 @@
 import shutil
 
 from .helpers.cfs_helpers import find_by_name
-from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, is_test_result_ok
 
 
 module_name = 'cfs_restore'
@@ -60,9 +60,12 @@ def setUp(self):
     def add_data_in_cluster(self):
         pass
 
+    @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
     def tearDown(self):
-        self.node.cleanup()
-        self.del_test_dir(module_name, self.fname)
+        module_name = self.id().split('.')[1]
+        fname = self.id().split('.')[3]
+        if is_test_result_ok(self):
+            self.del_test_dir(module_name, fname)
 
 
 class CfsRestoreNoencEmptyTablespaceTest(CfsRestoreBase):

tests/helpers/ptrack_helpers.py

@@ -1,6 +1,7 @@
 # you need os for unittest to work
 import os
 import gc
+import unittest
 from sys import exit, argv, version_info
 import subprocess
 import shutil
@@ -172,6 +173,30 @@ def slow_start(self, replica=False):
 
         sleep(0.5)
 
+
+def is_test_result_ok(test_case):
+    # sources of solution:
+    # 1. python versions 2.7 - 3.10, verified on 3.10, 3.7, 2.7, taken from:
+    # https://tousu.in/qa/?qa=555402/unit-testing-getting-pythons-unittest-results-in-a-teardown-method&show=555403#a555403
+    #
+    # 2. python versions 3.11+ mixin, verified on 3.11, taken from: https://stackoverflow.com/a/39606065
+
+    if hasattr(test_case, '_outcome'):  # Python 3.4+
+        if hasattr(test_case._outcome, 'errors'):
+            # Python 3.4 - 3.10  (These two methods have no side effects)
+            result = test_case.defaultTestResult()  # These two methods have no side effects
+            test_case._feedErrorsToResult(result, test_case._outcome.errors)
+        else:
+            # Python 3.11+
+            result = test_case._outcome.result
+    else:  # Python 2.7, 3.0-3.3
+        result = getattr(test_case, '_outcomeForDoCleanups', test_case._resultForDoCleanups)
+
+    ok = all(test != test_case for test, text in result.errors + result.failures)
+
+    return ok
+
+
 class ProbackupTest(object):
     # Class attributes
     enterprise = is_enterprise()