Rename the skip_long_test flag to skip_expensive_test to filter both long-lasting and resources consuming tests

Author: Thierry RAMORASOAVINA

.github/workflows/tests.yml

@@ -15,11 +15,11 @@ on:
       khiops-desktop-revision:
         default: 10.2.4
         description: Khiops Windows Desktop Application Version
-      run-long-tests:
+      run-expensive-tests:
         type: boolean
         required: false
         default: false
-        description: Execute long tests
+        description: Execute expensive tests
   pull_request:
     paths:
       - khiops/**.py
@@ -110,8 +110,8 @@ jobs:
             rm -rf khiops.egg-info
           done
       - name: Prepare Unit Tests Environment
-        if: github.ref != 'dev' && github.ref != 'main' && ! inputs.run-long-tests
-        run: echo "UNITTEST_ONLY_SHORT_TESTS=true" >> "$GITHUB_ENV"
+        if: github.ref != 'dev' && github.ref != 'main' && ! inputs.run-expensive-tests
+        run: echo "SKIP_EXPENSIVE_TESTS=true" >> "$GITHUB_ENV"
       - name: Prepare Integration Tests on remote files
         env:
           AWS_ENDPOINT_URL: http://localhost:4569

tests/test_helper.py

@@ -272,10 +272,10 @@ def get_with_subkey(dictionary, subkey):
         return values
 
     @staticmethod
-    def skip_long_test(test_case):
-        if "UNITTEST_ONLY_SHORT_TESTS" in os.environ:
-            if os.environ["UNITTEST_ONLY_SHORT_TESTS"].lower() == "true":
-                test_case.skipTest("Skipping long test")
+    def skip_expensive_test(test_case):
+        if "SKIP_EXPENSIVE_TESTS" in os.environ:
+            if os.environ["SKIP_EXPENSIVE_TESTS"].lower() == "true":
+                test_case.skipTest("Skipping expensive test")
 
     @staticmethod
     def create_parameter_trace():

tests/test_khiops_integrations.py

@@ -223,7 +223,7 @@ class KhiopsMultitableFitTests(unittest.TestCase):
     """Test if Khiops estimator can be fitted on multi-table data"""
 
     def setUp(self):
-        KhiopsTestHelper.skip_long_test(self)
+        KhiopsTestHelper.skip_expensive_test(self)
 
     def test_estimator_multiple_create_and_fit_does_not_raise_exception(self):
         """Test if estimator can be fitted from paths several times"""

tests/test_parallel_execution.py

@@ -28,7 +28,7 @@ class KhiopsParallelRunningTests(TestCase, KhiopsTestHelper):
     _n_cpus = -1
 
     def setUp(self):
-        KhiopsTestHelper.skip_long_test(self)
+        KhiopsTestHelper.skip_expensive_test(self)
 
     def _parallelise(self, callback, arg_sequence, n_cpus):
         """Parallelisation driver"""

tests/test_remote_access.py

@@ -140,6 +140,8 @@ def is_in_a_conda_env():
             ) == os.path.dirname(khiops_path)
 
         def setUp(self):
+            # Skip if only short and cheap tests are run
+            KhiopsTestHelper.skip_expensive_test(self)
 
             self.skip_if_no_config()
             if self.is_in_a_conda_env() and self.should_skip_in_a_conda_env():
@@ -221,8 +223,6 @@ def test_khiops_classifier_with_remote_access(self):
 
         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
-            KhiopsTestHelper.skip_long_test(self)
 
             # Setup paths
             # note : the current implementation forces the khiops.log file

tests/test_samples.py

@@ -16,7 +16,7 @@ class KhiopsSamplesTests(unittest.TestCase):
     """Test if all samples run without problems"""
 
     def setUp(self):
-        KhiopsTestHelper.skip_long_test(self)
+        KhiopsTestHelper.skip_expensive_test(self)
 
     def test_samples(self):
         """Test if all samples run without problems"""

tests/test_sklearn_output_types.py

@@ -49,7 +49,7 @@ class KhiopsSklearnOutputTypes(unittest.TestCase):
     """Tests for checking the output types of predictors"""
 
     def setUp(self):
-        KhiopsTestHelper.skip_long_test(self)
+        KhiopsTestHelper.skip_expensive_test(self)
 
     def _replace(self, array, replacement_dict):
         return np.array([replacement_dict[value] for value in array])