comment

src/promptflow-devkit/tests/_constants.py

@@ -1,11 +1,10 @@
 from pathlib import Path
 
-PROMOTFLOW_ROOT = Path(__file__).parent.parent
-RUNTIME_TEST_CONFIGS_ROOT = Path(PROMOTFLOW_ROOT / "tests/test_configs/runtime")
-EXECUTOR_REQUESTS_ROOT = Path(PROMOTFLOW_ROOT / "tests/test_configs/executor_api_requests")
-MODEL_ROOT = Path(PROMOTFLOW_ROOT / "tests/test_configs/e2e_samples")
-CONNECTION_FILE = (PROMOTFLOW_ROOT / "connections.json").resolve().absolute().as_posix()
-ENV_FILE = (PROMOTFLOW_ROOT / ".env").resolve().absolute().as_posix()
+PROMPTFLOW_ROOT = Path(__file__).parent.parent.parent / "promptflow"
+RUNTIME_TEST_CONFIGS_ROOT = Path(PROMPTFLOW_ROOT / "tests/test_configs/runtime")
+MODEL_ROOT = Path(PROMPTFLOW_ROOT / "tests/test_configs/e2e_samples")
+CONNECTION_FILE = (PROMPTFLOW_ROOT / "connections.json").resolve().absolute().as_posix()
+ENV_FILE = (PROMPTFLOW_ROOT / ".env").resolve().absolute().as_posix()
 
 # below constants are used for pfazure and global config tests
 DEFAULT_SUBSCRIPTION_ID = "96aede12-2f73-41cb-b983-6d11a904839b"

src/promptflow-devkit/tests/conftest.py

@@ -7,7 +7,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from _constants import CONNECTION_FILE, ENV_FILE
+from _constants import CONNECTION_FILE, ENV_FILE, PROMOTFLOW_ROOT
 from _pytest.monkeypatch import MonkeyPatch
 from dotenv import load_dotenv
 from filelock import FileLock
@@ -22,9 +22,9 @@
 load_dotenv()
 
 
-@pytest.fixture(scope="session", autouse=True)
-def modify_work_directory():
-    os.chdir(Path(__file__).parent.parent.absolute())
+#@pytest.fixture(scope="session", autouse=True)
+#def modify_work_directory():
+#    os.chdir(Path(__file__).parent.parent.absolute())
 
 
 @pytest.fixture(autouse=True, scope="session")
@@ -77,7 +77,7 @@ def temp_output_dir() -> str:
 
 @pytest.fixture
 def prepare_symbolic_flow() -> str:
-    flows_dir = Path(__file__).parent / "test_configs" / "flows"
+    flows_dir = PROMOTFLOW_ROOT / "tests" / "test_configs" / "flows"
     target_folder = flows_dir / "web_classification_with_symbolic"
     source_folder = flows_dir / "web_classification"
 
@@ -104,11 +104,6 @@ def install_custom_tool_pkg():
             subprocess.check_call([sys.executable, "-m", "pip", "install", "test-custom-tools==0.0.2"])
 
 
-@pytest.fixture
-def mocked_ws_triple() -> AzureMLWorkspaceTriad:
-    return AzureMLWorkspaceTriad("mock_subscription_id", "mock_resource_group", "mock_workspace_name")
-
-
 @pytest.fixture(scope="session")
 def mock_list_func():
     """Mock function object for dynamic list testing."""

src/promptflow-devkit/tests/sdk_cli_test/conftest.py

@@ -10,6 +10,8 @@
 from pytest_mock import MockerFixture
 from sqlalchemy import create_engine
 
+from _constants import PROMPTFLOW_ROOT, RUNTIME_TEST_CONFIGS_ROOT, CONNECTION_FILE, MODEL_ROOT
+
 from promptflow._sdk._configuration import Configuration
 from promptflow._sdk._constants import EXPERIMENT_CREATED_ON_INDEX_NAME, EXPERIMENT_TABLE_NAME, LOCAL_MGMT_DB_PATH
 from promptflow._sdk.entities import AzureOpenAIConnection as AzureOpenAIConnectionEntity
@@ -41,14 +43,9 @@ def is_replay():
         return False
 
 
-PROMOTFLOW_ROOT = Path(__file__) / "../../.."
-RUNTIME_TEST_CONFIGS_ROOT = Path(PROMOTFLOW_ROOT / "tests/test_configs/runtime")
-CONNECTION_FILE = (PROMOTFLOW_ROOT / "connections.json").resolve().absolute().as_posix()
-MODEL_ROOT = Path(PROMOTFLOW_ROOT / "tests/test_configs/flows")
-EAGER_FLOW_ROOT = Path(PROMOTFLOW_ROOT / "tests/test_configs/eager_flows")
+EAGER_FLOW_ROOT = Path(PROMPTFLOW_ROOT / "tests/test_configs/eager_flows")
 
-SRC_ROOT = PROMOTFLOW_ROOT / ".."
-RECORDINGS_TEST_CONFIGS_ROOT = Path(SRC_ROOT / "promptflow-recording/recordings/local").resolve()
+RECORDINGS_TEST_CONFIGS_ROOT = Path(PROMPTFLOW_ROOT / "src" / "promptflow-recording/recordings/local").resolve()
 
 
 def pytest_configure():

src/promptflow-devkit/tests/sdk_cli_test/e2etests/test_chat_group.py

@@ -4,11 +4,9 @@
 
 from promptflow._sdk.entities._chat_group._chat_group import ChatGroup
 from promptflow._sdk.entities._chat_group._chat_role import ChatRole
+from _constants import PROMPTFLOW_ROOT
 
-PROMOTFLOW_ROOT = Path(__file__) / "../../../.."
-
-TEST_ROOT = Path(__file__).parent.parent.parent
-FLOWS_DIR = TEST_ROOT / "test_configs/flows"
+FLOWS_DIR = PROMPTFLOW_ROOT / "tests/test_configs/flows"
 
 
 @pytest.mark.sdk_test