chore: Refactor some unit tests into integration tests (#5820)

* chore: Refactor some unit tests into integration tests

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

* chore: Refactor some unit tests into integration tests

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

* rename TestConfig

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

* rename TestConfig

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

* add integration flag

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

* update paths

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

* update paths

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

---------

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

Author: franciscojavierarceo

.github/workflows/registry-rest-api-tests.yml

@@ -145,8 +145,8 @@ jobs:
       - name: Setup and Run Registry Rest API tests
         run: |
           echo "Running Registry REST API tests..."
-          cd sdk/python/tests/registry_rest_api_tests/
-          pytest test_feast_registry.py -s
+          cd sdk/python
+          pytest tests/integration/registration/rest_api/test_registry_rest_api.py --integration -s
 
       - name: Clean up docker images
         if: always()

…ests/registry_rest_api_tests/conftest.py …ration/registration/rest_api/conftest.pysdk/python/tests/registry_rest_api_tests/conftest.py renamed to sdk/python/tests/integration/registration/rest_api/conftest.py sdk/python/tests/registry_rest_api_tests/conftest.py renamed to sdk/python/tests/integration/registration/rest_api/conftest.py

@@ -1,9 +1,11 @@
 import os
+from pathlib import Path
 
 import pytest
 import requests
 from kubernetes import client, config
-from support import (
+
+from tests.integration.registration.rest_api.support import (
     applyFeastProject,
     create_feast_project,
     create_namespace,
@@ -41,6 +43,10 @@ def feast_rest_client():
     config.load_kube_config()
     api_instance = client.CoreV1Api()
 
+    # Get the directory containing this conftest.py file
+    test_dir = Path(__file__).parent
+    resource_dir = test_dir / "resource"
+
     # Constants and environment values
     namespace = "test-ns-feast-rest"
     credit_scoring = "credit-scoring"
@@ -54,23 +60,37 @@ def feast_rest_client():
     try:
         if not run_on_openshift:
             # Deploy dependencies
-            deploy_and_validate_pod(namespace, "resource/redis.yaml", "app=redis")
-            deploy_and_validate_pod(namespace, "resource/postgres.yaml", "app=postgres")
+            deploy_and_validate_pod(
+                namespace, str(resource_dir / "redis.yaml"), "app=redis"
+            )
+            deploy_and_validate_pod(
+                namespace, str(resource_dir / "postgres.yaml"), "app=postgres"
+            )
 
             # Create and validate FeatureStore CRs
             create_feast_project(
-                "resource/feast_config_credit_scoring.yaml", namespace, credit_scoring
+                str(resource_dir / "feast_config_credit_scoring.yaml"),
+                namespace,
+                credit_scoring,
             )
             validate_feature_store_cr_status(namespace, credit_scoring)
 
             create_feast_project(
-                "resource/feast_config_driver_ranking.yaml", namespace, driver_ranking
+                str(resource_dir / "feast_config_driver_ranking.yaml"),
+                namespace,
+                driver_ranking,
             )
             validate_feature_store_cr_status(namespace, driver_ranking)
 
             # Deploy ingress and get route URL
             run_kubectl_command(
-                ["apply", "-f", "resource/feast-registry-nginx.yaml", "-n", namespace]
+                [
+                    "apply",
+                    "-f",
+                    str(resource_dir / "feast-registry-nginx.yaml"),
+                    "-n",
+                    namespace,
+                ]
             )
             ingress_host = run_kubectl_command(
                 [
@@ -114,7 +134,7 @@ def feast_rest_client():
                 aws_secret_key,
                 aws_bucket,
                 registry_path,
-                "resource/feast_config_rhoai.yaml",
+                str(resource_dir / "feast_config_rhoai.yaml"),
                 namespace,
             )
             validate_feature_store_cr_status(namespace, "test-s3")