Skip to content

Commit 169ddcc

Browse files
committed
fix test
1 parent 6a4a271 commit 169ddcc

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

tests/integration/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def unified_config(env_or_skip) -> Config:
9393
config.experimental_is_unified_host = True
9494
return config
9595

96+
9697
@pytest.fixture(scope="session")
9798
def w(env_or_skip) -> WorkspaceClient:
9899
_load_debug_env_if_runs_from_ide("workspace")

tests/integration/test_unified_profile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ def test_workspace_operations(unified_config):
66
user = client.current_user.me()
77
assert user is not None
88

9+
910
def test_account_operations(unified_config):
1011
client = AccountClient(config=unified_config)
1112
groups = client.groups.list()

tests/test_config.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import pytest
1111

12-
from databricks.sdk import oauth, useragent
12+
from databricks.sdk import oauth, useragent, WorkspaceClient
1313
from databricks.sdk.config import (ClientType, Config, HostType, with_product,
1414
with_user_agent_extra)
1515
from databricks.sdk.version import __version__
@@ -424,9 +424,8 @@ def test_oidc_endpoints_unified_missing_ids():
424424

425425
def test_workspace_org_id_header_on_unified_host(requests_mock):
426426
"""Test that X-Databricks-Org-Id header is added for workspace clients on unified hosts."""
427-
from databricks.sdk.core import ApiClient
428427

429-
requests_mock.get("https://unified.databricks.com/api/2.0/test", json={"result": "success"})
428+
requests_mock.get("https://unified.databricks.com/api/2.0/preview/scim/v2/Me", json={"result": "success"})
430429

431430
config = Config(
432431
host="https://unified.databricks.com",
@@ -435,8 +434,8 @@ def test_workspace_org_id_header_on_unified_host(requests_mock):
435434
token="test-token",
436435
)
437436

438-
api_client = ApiClient(config)
439-
api_client.do("GET", "/api/2.0/test")
437+
workspace_client = WorkspaceClient(config=config)
438+
workspace_client.current_user.me()
440439

441440
# Verify the request was made with the X-Databricks-Org-Id header
442441
assert requests_mock.last_request.headers.get("X-Databricks-Org-Id") == "test-workspace-123"

0 commit comments

Comments
 (0)