codemie-test-harness 0.1.158__py3-none-any.whl → 0.1.160__py3-none-any.whl

codemie_test_harness/tests/utils/env_resolver.py

@@ -0,0 +1,119 @@
+"""
+Environment resolver utility that determines environment from CODEMIE_API_DOMAIN.
+
+This module provides a robust way to resolve the environment based on the
+API domain, eliminating the need for hardcoded ENV variables and preventing
+configuration drift between domain and environment settings.
+"""
+
+import os
+import re
+
+from codemie_test_harness.tests.enums.environment import Environment
+
+
+class EnvironmentResolver:
+    """
+    Resolves environment configuration based on CODEMIE_API_DOMAIN.
+
+    Supported environments and their domain patterns:
+    - prod: Production domains (*.lab.epam.com)
+    - preview: Preview domains (*-preview.lab.epam.com)
+    - localhost: Local development (localhost, 127.0.0.1)
+    - azure: Azure sandbox environments (*-azure.eks-sandbox.*)
+    - gcp: GCP sandbox environments (*-gcp.eks-sandbox.*)
+    - aws: AWS sandbox environments (*-aws.eks-sandbox.*)
+    - unknown: Any unrecognized domain
+    """
+
+    # Regex patterns for environment detection (order matters - more specific first)
+    DOMAIN_PATTERNS = {
+        # Production environments
+        r"^https?://.*codemie\.lab\.epam\.com(/.*)?$": Environment.PRODUCTION,
+        # Preview environments
+        r"^https?://.*codemie-preview\.lab\.epam\.com(/.*)?$": Environment.PREVIEW,
+        # Specific cloud sandbox environments
+        r"^https?://.*codemie-azure\.eks-sandbox\.aws\.main\.edp\.projects\.epam\.com(/.*)?$": Environment.AZURE,
+        r"^https?://.*codemie-gcp\.eks-sandbox\.aws\.main\.edp\.projects\.epam\.com(/.*)?$": Environment.GCP,
+        r"^https?://.*codemie-aws\.eks-sandbox\.aws\.main\.edp\.projects\.epam\.com(/.*)?$": Environment.AWS,
+        # Local development patterns
+        r"^https?://localhost(:\d+)?(/.*)?$": Environment.LOCALHOST,
+        r"^https?://127\.0\.0\.1(:\d+)?(/.*)?$": Environment.LOCALHOST,
+    }
+
+    @classmethod
+    def get_environment(cls) -> Environment:
+        """
+        Get the current environment based on CODEMIE_API_DOMAIN.
+
+        This is the main method that should be used throughout the codebase
+        to replace os.getenv("ENV") calls.
+
+        Returns:
+            Environment: The resolved environment enum value
+
+        Raises:
+            ValueError: If CODEMIE_API_DOMAIN is not set
+        """
+        codemie_api_domain = os.getenv("CODEMIE_API_DOMAIN")
+
+        if not codemie_api_domain:
+            raise ValueError("CODEMIE_API_DOMAIN environment variable is not set")
+
+        # Clean up the domain (remove trailing slashes)
+        domain = codemie_api_domain.rstrip("/")
+
+        # Try pattern matching (order matters - more specific patterns first)
+        for pattern, environment in cls.DOMAIN_PATTERNS.items():
+            if re.match(pattern, domain, re.IGNORECASE):
+                return environment
+
+        # If no match found, return 'unknown'
+        return Environment.UNKNOWN
+
+    @classmethod
+    def is_production(cls) -> bool:
+        """Check if current environment is production."""
+        return cls.get_environment().is_production
+
+    @classmethod
+    def is_preview(cls) -> bool:
+        """Check if current environment is preview."""
+        return cls.get_environment().is_preview
+
+    @classmethod
+    def is_localhost(cls) -> bool:
+        """Check if current environment is localhost."""
+        return cls.get_environment().is_localhost
+
+    @classmethod
+    def is_sandbox(cls) -> bool:
+        """Check if current environment is any sandbox environment."""
+        return cls.get_environment().is_sandbox
+
+    @classmethod
+    def is_azure(cls) -> bool:
+        """Check if current environment is Azure."""
+        return cls.get_environment().is_azure
+
+    @classmethod
+    def is_gcp(cls) -> bool:
+        """Check if current environment is GCP."""
+        return cls.get_environment().is_gcp
+
+    @classmethod
+    def is_aws(cls) -> bool:
+        """Check if current environment is AWS."""
+        return cls.get_environment().is_aws
+
+
+def get_environment() -> Environment:
+    """
+    Convenience function to get the current environment.
+
+    This is the primary function that should replace os.getenv("ENV") throughout the codebase.
+
+    Returns:
+        Environment: The resolved environment enum value
+    """
+    return EnvironmentResolver.get_environment()

codemie_test_harness/tests/workflow/assistant_tools/cloud/test_workflow_with_assistant_cloud_tools.py

@@ -1,6 +1,5 @@
 import pytest
 
-from codemie_test_harness.tests.enums.tools import Toolkit, CloudTool
 from codemie_test_harness.tests.test_data.cloud_tools_test_data import cloud_test_data
 
 
@@ -11,12 +10,6 @@ from codemie_test_harness.tests.test_data.cloud_tools_test_data import cloud_tes
 @pytest.mark.parametrize(
     "toolkit,tool_name,credential_type,credentials,prompt,expected_response",
     cloud_test_data,
-    ids=[
-        f"{Toolkit.CLOUD}_{CloudTool.AWS}",
-        f"{Toolkit.CLOUD}_{CloudTool.AZURE}",
-        f"{Toolkit.CLOUD}_{CloudTool.GCP}",
-        f"{Toolkit.CLOUD}_{CloudTool.KUBERNETES}",
-    ],
 )
 def test_workflow_with_cloud_tools(
     assistant,

codemie_test_harness/tests/workflow/assistant_tools/codebase/test_worfklow_with_assistant_codebase_tools.py

@@ -44,7 +44,6 @@ def test_workflow_with_codebase_tools(
 @pytest.mark.parametrize(
     "toolkit, tool_name, credentials, prompt,expected",
     sonar_tools_test_data,
-    ids=[f"{row[0]}_{row[1]}" for row in sonar_tools_test_data],
 )
 def test_workflow_with_sonar_tools(
     assistant,

codemie_test_harness/tests/workflow/assistant_tools/data_management/test_workflow_with_assistant_with_data_management_tools.py

@@ -1,9 +1,6 @@
-import os
-
 import pytest
 from codemie_sdk.models.integration import CredentialTypes
 
-from codemie_test_harness.tests.enums.integrations import DataBaseDialect
 from codemie_test_harness.tests.enums.tools import DataManagementTool, Toolkit
 from codemie_test_harness.tests.test_data.data_management_tools_test_data import (
     ELASTIC_TOOL_TASK,
@@ -16,9 +13,11 @@ from codemie_test_harness.tests.test_data.data_management_tools_test_data import
     RESPONSE_FOR_SQL,
 )
 from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 pytestmark = pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this tests on local environment"
+    EnvironmentResolver.is_localhost(),
+    reason="Skipping this tests on local environment",
 )
 
 
@@ -56,7 +55,6 @@ def test_workflow_with_assistant_with_elastic_tools(
 @pytest.mark.parametrize(
     "db_dialect",
     sql_tools_test_data,
-    ids=[DataBaseDialect.MY_SQL, DataBaseDialect.POSTGRES, DataBaseDialect.MS_SQL],
 )
 def test_workflow_with_assistant_with_sql_tools(
     assistant,

codemie_test_harness/tests/workflow/assistant_tools/file_management/test_workflow_with_assistant_with_file_management_tools.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 from hamcrest import assert_that, contains_string, is_not, all_of
 
@@ -18,6 +16,7 @@ from codemie_test_harness.tests.test_data.file_management_tools_test_data import
     RESPONSE_FOR_FILE_EDITOR,
 )
 from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 
 @pytest.mark.workflow
@@ -27,12 +26,6 @@ from codemie_test_harness.tests.utils.base_utils import get_random_name
 @pytest.mark.parametrize(
     "tool_name, prompt, expected_response",
     file_management_tools_test_data,
-    ids=[
-        FileManagementTool.PYTHON_CODE_INTERPRETER,
-        FileManagementTool.LIST_DIRECTORY,
-        FileManagementTool.WRITE_FILE,
-        FileManagementTool.RUN_COMMAND_LINE,
-    ],
 )
 def test_workflow_with_assistant_with_file_management_tools(
     assistant,
@@ -58,7 +51,7 @@ def test_workflow_with_assistant_with_file_management_tools(
 @pytest.mark.file_management
 @pytest.mark.regression
 @pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
+    EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
 )
 def test_workflow_with_assistant_with_generate_image_tool(
     assistant,

codemie_test_harness/tests/workflow/assistant_tools/mcp/test_workflow_with_assistant_with_mcp_server.py

@@ -1,4 +1,4 @@
-import os
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 import pytest
 
@@ -15,14 +15,15 @@ from codemie_test_harness.tests.test_data.mcp_server_test_data import (
     CLI_MCP_SERVER,
 )
 
+pytestmark = pytest.mark.skipif(
+    EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
+)
+
 
 @pytest.mark.workflow
 @pytest.mark.workflow_with_assistant
 @pytest.mark.mcp
 @pytest.mark.regression
-@pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
-)
 def test_workflow_with_assistant_with_time_mcp_server(
     assistant,
     workflow_with_assistant,
@@ -49,9 +50,6 @@ def test_workflow_with_assistant_with_time_mcp_server(
     cli_mcp_server_test_data,
     ids=[f"{row[0]}" for row in cli_mcp_server_test_data],
 )
-@pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
-)
 def test_workflow_with_assistant_with_cli_mcp_server(
     assistant,
     workflow_with_assistant,
@@ -77,9 +75,6 @@ def test_workflow_with_assistant_with_cli_mcp_server(
 @pytest.mark.workflow_with_assistant
 @pytest.mark.mcp
 @pytest.mark.regression
-@pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
-)
 def test_workflow_with_assistant_with_fetch_mcp_server(
     assistant,
     workflow_with_assistant,

codemie_test_harness/tests/workflow/assistant_tools/notification/test_workflow_with_assistant_notification_tools.py

@@ -1,4 +1,5 @@
-import os
+from codemie_test_harness.tests.enums.environment import Environment
+from codemie_test_harness.tests.utils.env_resolver import get_environment
 
 import pytest
 from hamcrest import assert_that, equal_to
@@ -20,7 +21,7 @@ from codemie_test_harness.tests.test_data.notification_tools_test_data import (
 @pytest.mark.email
 @pytest.mark.regression
 @pytest.mark.skipif(
-    os.getenv("ENV") in ["local", "gcp"],
+    get_environment() in [Environment.LOCALHOST, Environment.GCP],
     reason="Skipping this test on local environment",
 )
 def test_workflow_with_email_tool(

codemie_test_harness/tests/workflow/assistant_tools/open_api/test_workflow_with_assistant_with_open_api_tools.py

@@ -1,4 +1,4 @@
-import os
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 import pytest
 
@@ -18,7 +18,8 @@ from codemie_test_harness.tests.test_data.open_api_tools_test_data import (
     ids=[f"{row[0]}" for row in open_api_tools_test_data],
 )
 @pytest.mark.skipif(
-    os.getenv("ENV") == "azure", reason="Still have an issue with encoding long strings"
+    EnvironmentResolver.is_azure(),
+    reason="Still have an issue with encoding long strings",
 )
 def test_workflow_with_assistant_with_open_api_tools(
     assistant,

codemie_test_harness/tests/workflow/assistant_tools/report_portal/test_workflow_with_assistant_with_report_portal_tools.py

@@ -0,0 +1,38 @@
+import pytest
+
+from codemie_test_harness.tests.test_data.report_portal_tools_test_data import (
+    rp_test_data,
+)
+
+
+@pytest.mark.workflow
+@pytest.mark.workflow_with_assistant
+@pytest.mark.report_portal
+@pytest.mark.regression
+@pytest.mark.parametrize(
+    "toolkit,tool_name,prompt,expected_response",
+    rp_test_data,
+    ids=[f"{row[0]}_{row[1]}" for row in rp_test_data],
+)
+def test_workflow_with_assistant_with_report_portal_tools(
+    assistant,
+    workflow_with_assistant,
+    workflow_utils,
+    report_portal_integration,
+    similarity_check,
+    toolkit,
+    tool_name,
+    prompt,
+    expected_response,
+):
+    assistant = assistant(
+        toolkit,
+        tool_name,
+        settings=report_portal_integration,
+    )
+
+    workflow_with_assistant = workflow_with_assistant(assistant, prompt)
+    response = workflow_utils.execute_workflow(
+        workflow_with_assistant.id, assistant.name
+    )
+    similarity_check.check_similarity(response, expected_response)

codemie_test_harness/tests/workflow/direct_tools_calling/test_workflow_with_data_management_tools_sql.py

@@ -1,6 +1,5 @@
 import copy
 import json
-import os
 import random
 
 import pytest
@@ -11,10 +10,12 @@ from codemie_test_harness.tests.test_data.direct_tools.data_management_tools_tes
     sql_tools_test_data,
 )
 from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 from codemie_test_harness.tests.utils.base_utils import get_random_name
 
 pytestmark = pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this tests on local environment"
+    EnvironmentResolver.is_localhost(),
+    reason="Skipping this tests on local environment",
 )
 
 

codemie_test_harness/tests/workflow/direct_tools_calling/test_workflow_with_open_api_tools.py

@@ -1,6 +1,5 @@
 import copy
 import json
-import os
 import random
 
 import pytest
@@ -9,9 +8,11 @@ from codemie_test_harness.tests.test_data.direct_tools.open_api_tools_test_data
     open_api_tools_test_data,
 )
 from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 pytestmark = pytest.mark.skipif(
-    os.getenv("ENV") == "azure", reason="Still have an issue with encoding long strings"
+    EnvironmentResolver.is_azure(),
+    reason="Still have an issue with encoding long strings",
 )
 
 

codemie_test_harness/tests/workflow/direct_tools_calling/test_workflow_with_report_portal_tools.py

@@ -0,0 +1,115 @@
+import copy
+import json
+import random
+
+import pytest
+
+from codemie_test_harness.tests.test_data.direct_tools.report_portal_tools_test_data import (
+    report_portal_tools_test_data,
+)
+from codemie_test_harness.tests.utils.base_utils import get_random_name
+
+
+@pytest.mark.workflow
+@pytest.mark.direct_tool
+@pytest.mark.report_portal
+@pytest.mark.regression
+@pytest.mark.parametrize(
+    "toolkit,tool_name,prompt,expected_response",
+    report_portal_tools_test_data,
+    ids=[f"{row[0]}_{row[1]}" for row in report_portal_tools_test_data],
+)
+def test_workflow_with_report_portal_tool_direct(
+    report_portal_integration,
+    workflow_utils,
+    workflow_with_tool,
+    similarity_check,
+    toolkit,
+    tool_name,
+    prompt,
+    expected_response,
+):
+    assistant_and_state_name = get_random_name()
+
+    test_workflow = workflow_with_tool(
+        assistant_and_state_name,
+        tool_name,
+        integration=report_portal_integration,
+    )
+    response = workflow_utils.execute_workflow(
+        test_workflow.id,
+        assistant_and_state_name,
+        user_input=json.dumps(prompt),
+    )
+    similarity_check.check_similarity(response, expected_response)
+
+
+@pytest.mark.workflow
+@pytest.mark.direct_tool
+@pytest.mark.report_portal
+@pytest.mark.regression
+@pytest.mark.parametrize(
+    "toolkit,tool_name,prompt,expected_response",
+    report_portal_tools_test_data,
+    ids=[f"{row[0]}_{row[1]}" for row in report_portal_tools_test_data],
+)
+def test_workflow_with_report_portal_tool_with_hardcoded_args(
+    report_portal_integration,
+    workflow_utils,
+    workflow_with_tool,
+    similarity_check,
+    toolkit,
+    tool_name,
+    prompt,
+    expected_response,
+):
+    assistant_and_state_name = get_random_name()
+
+    test_workflow = workflow_with_tool(
+        assistant_and_state_name,
+        tool_name,
+        integration=report_portal_integration,
+        tool_args=prompt,
+    )
+    response = workflow_utils.execute_workflow(
+        test_workflow.id, assistant_and_state_name
+    )
+    similarity_check.check_similarity(response, expected_response)
+
+
+@pytest.mark.workflow
+@pytest.mark.direct_tool
+@pytest.mark.report_portal
+@pytest.mark.regression
+@pytest.mark.parametrize(
+    "toolkit,tool_name,prompt,expected_response",
+    report_portal_tools_test_data,
+    ids=[f"{row[0]}_{row[1]}" for row in report_portal_tools_test_data],
+)
+def test_workflow_with_report_portal_tool_with_overriding_args(
+    report_portal_integration,
+    workflow_utils,
+    workflow_with_tool,
+    similarity_check,
+    toolkit,
+    tool_name,
+    prompt,
+    expected_response,
+):
+    assistant_and_state_name = get_random_name()
+
+    args_copy = copy.deepcopy(prompt)
+    args_copy = {key: random.randint(1, 10) for key in args_copy}
+
+    test_workflow = workflow_with_tool(
+        assistant_and_state_name,
+        tool_name,
+        integration=report_portal_integration,
+        tool_args=args_copy,
+    )
+    response = workflow_utils.execute_workflow(
+        test_workflow.id,
+        assistant_and_state_name,
+        user_input=json.dumps(prompt),
+    )
+    similarity_check.check_similarity(response, expected_response)

codemie_test_harness/tests/workflow/virtual_assistant_tools/cloud/test_workflow_with_cloud_tools.py

@@ -1,6 +1,5 @@
 import pytest
 
-from codemie_test_harness.tests.enums.tools import Toolkit, CloudTool
 from codemie_test_harness.tests.test_data.cloud_tools_test_data import cloud_test_data
 from codemie_test_harness.tests.utils.base_utils import get_random_name
 
@@ -15,12 +14,6 @@ from codemie_test_harness.tests.utils.base_utils import get_random_name
 @pytest.mark.parametrize(
     "toolkit, tool_name, credential_type, credentials, prompt, expected_response",
     cloud_test_data,
-    ids=[
-        f"{Toolkit.CLOUD}_{CloudTool.AWS}",
-        f"{Toolkit.CLOUD}_{CloudTool.AZURE}",
-        f"{Toolkit.CLOUD}_{CloudTool.GCP}",
-        f"{Toolkit.CLOUD}_{CloudTool.KUBERNETES}",
-    ],
 )
 def test_workflow_with_cloud_tools(
     workflow_with_virtual_assistant,

codemie_test_harness/tests/workflow/virtual_assistant_tools/codebase/test_workflow_with_codebase_tools.py

@@ -70,7 +70,6 @@ def test_workflow_with_codebase_tools(
 @pytest.mark.parametrize(
     "toolkit, tool_name, credentials, prompt, expected_response",
     sonar_tools_test_data,
-    ids=[f"{row[1]}" for row in sonar_tools_test_data],
 )
 def test_workflow_with_sonar_tools(
     workflow_with_virtual_assistant,

codemie_test_harness/tests/workflow/virtual_assistant_tools/data_management/test_workflow_with_data_management_tools.py

@@ -1,9 +1,6 @@
-import os
-
 import pytest
 from codemie_sdk.models.integration import CredentialTypes
 
-from codemie_test_harness.tests.enums.integrations import DataBaseDialect
 from codemie_test_harness.tests.enums.tools import DataManagementTool
 from codemie_test_harness.tests.test_data.data_management_tools_test_data import (
     ELASTIC_TOOL_TASK,
@@ -16,10 +13,12 @@ from codemie_test_harness.tests.test_data.data_management_tools_test_data import
     RESPONSE_FOR_SQL,
 )
 from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 from codemie_test_harness.tests.utils.base_utils import get_random_name
 
 pytestmark = pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this tests on local environment"
+    EnvironmentResolver.is_localhost(),
+    reason="Skipping this tests on local environment",
 )
 
 
@@ -61,7 +60,6 @@ def test_workflow_with_elastic_tools(
 @pytest.mark.parametrize(
     "db_dialect",
     sql_tools_test_data,
-    ids=[DataBaseDialect.MY_SQL, DataBaseDialect.POSTGRES, DataBaseDialect.MS_SQL],
 )
 def test_workflow_with_sql_tools(
     workflow_with_virtual_assistant,

codemie_test_harness/tests/workflow/virtual_assistant_tools/file_management/test_workflow_with_file_management_tools.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 from hamcrest import assert_that, contains_string, is_not, all_of
 
@@ -18,6 +16,7 @@ from codemie_test_harness.tests.test_data.file_management_tools_test_data import
     RESPONSE_FOR_FILE_EDITOR,
 )
 from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 
 @pytest.mark.workflow
@@ -28,12 +27,6 @@ from codemie_test_harness.tests.utils.base_utils import get_random_name
 @pytest.mark.parametrize(
     "tool_name, prompt, expected_response",
     file_management_tools_test_data,
-    ids=[
-        FileManagementTool.PYTHON_CODE_INTERPRETER,
-        FileManagementTool.LIST_DIRECTORY,
-        FileManagementTool.WRITE_FILE,
-        FileManagementTool.RUN_COMMAND_LINE,
-    ],
 )
 def test_workflow_with_file_management_tools(
     workflow_with_virtual_assistant,
@@ -65,7 +58,7 @@ def test_workflow_with_file_management_tools(
 @pytest.mark.regression
 @pytest.mark.testcase("EPMCDME-6561")
 @pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
+    EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
 )
 def test_workflow_with_generate_image_tool(
     workflow_with_virtual_assistant, filesystem_integration, workflow_utils

codemie_test_harness/tests/workflow/virtual_assistant_tools/mcp/test_workflow_with_mcp_server.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 
 from codemie_test_harness.tests.test_data.mcp_server_test_data import (
@@ -15,6 +13,11 @@ from codemie_test_harness.tests.test_data.mcp_server_test_data import (
     CLI_MCP_SERVER,
 )
 from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
+
+pytestmark = pytest.mark.skipif(
+    EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
+)
 
 
 @pytest.mark.workflow
@@ -22,9 +25,6 @@ from codemie_test_harness.tests.utils.base_utils import get_random_name
 @pytest.mark.mcp
 @pytest.mark.regression
 @pytest.mark.testcase("EPMCDME-6419")
-@pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
-)
 def test_workflow_with_time_mcp_server(
     workflow_with_virtual_assistant,
     workflow_utils,
@@ -51,9 +51,6 @@ def test_workflow_with_time_mcp_server(
 @pytest.mark.mcp
 @pytest.mark.regression
 @pytest.mark.testcase("EPMCDME-6419")
-@pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
-)
 @pytest.mark.parametrize(
     "command, expected_answer",
     cli_mcp_server_test_data,
@@ -86,9 +83,6 @@ def test_workflow_with_cli_mcp_server(
 @pytest.mark.mcp
 @pytest.mark.regression
 @pytest.mark.testcase("EPMCDME-6419")
-@pytest.mark.skipif(
-    os.getenv("ENV") == "local", reason="Skipping this test on local environment"
-)
 def test_workflow_with_fetch_mcp_server(
     workflow_with_virtual_assistant,
     workflow_utils,

codemie_test_harness/tests/workflow/virtual_assistant_tools/notification/test_workflow_with_notification_tools.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 from hamcrest import assert_that, equal_to
 
@@ -13,6 +11,8 @@ from codemie_test_harness.tests.test_data.notification_tools_test_data import (
     TELEGRAM_RESPONSE,
 )
 from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.enums.environment import Environment
+from codemie_test_harness.tests.utils.env_resolver import get_environment
 
 
 @pytest.mark.workflow
@@ -22,7 +22,7 @@ from codemie_test_harness.tests.utils.base_utils import get_random_name
 @pytest.mark.regression
 @pytest.mark.tescase("EPMCDME-6652")
 @pytest.mark.skipif(
-    os.getenv("ENV") in ["local", "gcp"],
+    get_environment() in [Environment.LOCALHOST, Environment.GCP],
     reason="Skipping this test on local environment",
 )
 def test_workflow_with_notification_email_tool(