Clean the khiops output_dir after each GCS and S3 remote access test

Author: Thierry RAMORASOAVINA

tests/test_remote_access.py

@@ -66,7 +66,7 @@ class KhiopsRemoteAccessTests(unittest.TestCase, KhiopsTestHelper):
 
         @classmethod
         def init_remote_bucket(cls, bucket_name=None, proto=None):
-            # create remote root_temp_dir
+            # create the remote root_temp_dir
             remote_resource = fs.create_resource(
                 f"{proto}://{bucket_name}/khiops-cicd/tmp"
             )
@@ -84,7 +84,7 @@ def init_remote_bucket(cls, bucket_name=None, proto=None):
                     f"{proto}://{bucket_name}/khiops-cicd/samples/{file}",
                     os.path.join(kh.get_samples_dir(), file),
                 )
-                # symetric call to ensure the upload was OK
+                # symmetric call to ensure the upload was OK
                 fs.copy_to_local(
                     f"{proto}://{bucket_name}/khiops-cicd/samples/{file}", "/tmp/dummy"
                 )
@@ -156,10 +156,22 @@ def setUp(self):
                 )
             self.print_test_title()
 
+        def tearDown(self):
+            # Cleanup the output dir (the files within and the folder)
+            if hasattr(self, "folder_name_to_clean_in_teardown"):
+                for filename in fs.list_dir(self.folder_name_to_clean_in_teardown):
+                    fs.remove(
+                        fs.get_child_path(
+                            self.folder_name_to_clean_in_teardown, filename
+                        )
+                    )
+                fs.remove(self.folder_name_to_clean_in_teardown)
+
         def test_train_predictor_with_remote_access(self):
             """Test train_predictor with remote resources"""
             iris_data_dir = fs.get_child_path(kh.get_runner().samples_dir, "Iris")
-            output_dir = fs.get_child_path(
+            # ask for folder cleaning during tearDown
+            self.folder_name_to_clean_in_teardown = output_dir = fs.get_child_path(
                 self.results_dir_root(),
                 f"test_{self.remote_access_test_case()}_remote_files_{uuid.uuid4()}",
             )
@@ -176,22 +188,21 @@ def test_train_predictor_with_remote_access(self):
                 trace=True,
             )
 
-            # Check the existents of the trining files
+            # Check the existence of the training files
             self.assertTrue(fs.exists(fs.get_child_path(output_dir, "AllReports.khj")))
             self.assertTrue(fs.exists(fs.get_child_path(output_dir, "Modeling.kdic")))
 
-            # Cleanup
-            for filename in fs.list_dir(output_dir):
-                fs.remove(fs.get_child_path(output_dir, filename))
-
         def test_khiops_classifier_with_remote_access(self):
             """Test the training of a khiops_classifier with remote resources"""
+
             # Setup paths
             # note : the current implementation forces the khiops.log file
             # to be created in the output_dir (thus local)
             # (any attempt to override it as an arg
             # for the fit method will be ignored)
-            output_dir = (
+
+            # ask for folder cleaning during tearDown
+            self.folder_name_to_clean_in_teardown = output_dir = (
                 self._khiops_temp_dir + f"/KhiopsClassifier_output_dir_{uuid.uuid4()}/"
             )
             iris_data_dir = fs.get_child_path(kh.get_runner().samples_dir, "Iris")
@@ -215,10 +226,6 @@ def test_khiops_classifier_with_remote_access(self):
             predict_path = fs.get_child_path(output_dir, "predict.txt")
             self.assertTrue(fs.exists(predict_path), msg=f"Path: {predict_path}")
 
-            # Cleanup
-            for filename in fs.list_dir(output_dir):
-                fs.remove(fs.get_child_path(output_dir, filename))
-
         def test_khiops_coclustering_with_remote_access(self):
             """Test the training of a khiops_coclustering with remote resources"""
             # Skip if only short tests are run
@@ -229,7 +236,9 @@ def test_khiops_coclustering_with_remote_access(self):
             # to be created in the output_dir (thus local)
             # (any attempt to override it as an arg
             # for the fit method will be ignored)
-            output_dir = (
+
+            # ask for folder cleaning during tearDown
+            self.folder_name_to_clean_in_teardown = output_dir = (
                 self._khiops_temp_dir
                 + f"/KhiopsCoclustering_output_dir_{uuid.uuid4()}/"
             )
@@ -262,6 +271,8 @@ def test_train_predictor_fail_and_log_with_remote_access(self):
                 self._khiops_temp_dir, f"khiops_log_{uuid.uuid4()}.log"
             )
 
+            # no cleaning required as an exception would be raised
+            # without any result produced
             output_dir = fs.get_child_path(
                 self.results_dir_root(),
                 f"test_{self.remote_access_test_case()}_remote_files_{uuid.uuid4()}",