Skip to content

Commit a2e9082

Browse files
Merge branch 'main' into error-details
2 parents cf33155 + f4db6f4 commit a2e9082

File tree

3 files changed

+7
-56
lines changed

3 files changed

+7
-56
lines changed

.github/workflows/downstreams.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

databricks/sdk/errors/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
# Deprecated.
1212
class ErrorDetail:
13-
1413
def __init__(
1514
self,
1615
type: str = None,

tests/test_model_serving_auth.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@ def test_model_serving_auth_refresh(monkeypatch, mocker):
162162

163163

164164
def test_agent_user_credentials(monkeypatch, mocker):
165+
# Guarantee that the tests defaults to env variables rather than config file.
166+
#
167+
# TODO: this is hacky and we should find a better way to tell the config
168+
# that it should not read from the config file.
169+
monkeypatch.setenv("DATABRICKS_CONFIG_FILE", "x")
170+
165171
monkeypatch.setenv("IS_IN_DB_MODEL_SERVING_ENV", "true")
166172
monkeypatch.setenv("DB_MODEL_SERVING_HOST_URL", "x")
167173
monkeypatch.setattr(
@@ -205,4 +211,4 @@ def test_agent_user_credentials_in_non_model_serving_environments(monkeypatch):
205211
headers = cfg.authenticate()
206212

207213
assert cfg.host == "https://x"
208-
assert headers.get("Authorization") == f"Bearer token"
214+
assert headers.get("Authorization") == "Bearer token"

0 commit comments

Comments
 (0)