Skip to content

[Internal] #1336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tanmay-db wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Internal] #1336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions tests/integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,16 @@ def inner(k=16) -> str:
def a(env_or_skip) -> AccountClient:
_load_debug_env_if_runs_from_ide("account")
env_or_skip("CLOUD_ENV")
account_client = AccountClient()
if env_or_skip("TEST_ENVIRONMENT_TYPE") not in ["ACCOUNT", "UC_ACCOUNT"]:
pytest.skip("not Databricks Account environment")
return account_client
_skip_if_not_environment_type("ACCOUNT", "UC_ACCOUNT")
return AccountClient()


@pytest.fixture(scope="session")
def ucacct(env_or_skip) -> AccountClient:
_load_debug_env_if_runs_from_ide("ucacct")
env_or_skip("CLOUD_ENV")
account_client = AccountClient()
if env_or_skip("TEST_ENVIRONMENT_TYPE") not in ["UC_ACCOUNT"]:
pytest.skip("not Databricks UC Account environment")
if "TEST_METASTORE_ID" not in os.environ:
pytest.skip("not in Unity Catalog Workspace test env")
return account_client
_skip_if_not_environment_type("UC_ACCOUNT")
return AccountClient()


@pytest.fixture(scope="session")
Expand All @@ -101,19 +95,15 @@ def unified_config(env_or_skip) -> Config:
def w(env_or_skip) -> WorkspaceClient:
_load_debug_env_if_runs_from_ide("workspace")
env_or_skip("CLOUD_ENV")
if env_or_skip("TEST_ENVIRONMENT_TYPE") not in ["WORKSPACE", "UC_WORKSPACE"]:
pytest.skip("not Databricks Workspace environment")
_skip_if_not_environment_type("WORKSPACE", "UC_WORKSPACE")
return WorkspaceClient()


@pytest.fixture(scope="session")
def ucws(env_or_skip) -> WorkspaceClient:
_load_debug_env_if_runs_from_ide("ucws")
env_or_skip("CLOUD_ENV")
if env_or_skip("TEST_ENVIRONMENT_TYPE") not in ["UC_WORKSPACE"]:
pytest.skip("not Databricks UC Workspace environment")
if "TEST_METASTORE_ID" not in os.environ:
pytest.skip("not Databricks UC Workspace environment")
_skip_if_not_environment_type("UC_WORKSPACE")
return WorkspaceClient()


Expand Down Expand Up @@ -162,6 +152,18 @@ def workspace_dir(w, random):
w.workspace.delete(directory, recursive=True)


def _skip_if_not_environment_type(*expected_types: str):
"""Skip the test if TEST_ENVIRONMENT_TYPE doesn't match any of the expected types.

TEST_ENVIRONMENT_TYPE values: "ACCOUNT", "WORKSPACE", "UC_ACCOUNT", "UC_WORKSPACE".
"""
env_type = os.getenv("TEST_ENVIRONMENT_TYPE", "")
if not env_type:
pytest.skip("Skipping test because TEST_ENVIRONMENT_TYPE is not set")
if env_type not in expected_types:
pytest.skip(f"Skipping {'/'.join(expected_types)} test in {env_type} environment")


def _load_debug_env_if_runs_from_ide(key) -> bool:
if not _is_in_debug():
return False
Expand Down
Loading