Skip to content

Commit 9d5e39c

Browse files
committed
Fix tests and url
Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com>
1 parent 8d6c57d commit 9d5e39c

3 files changed

Lines changed: 19 additions & 15 deletions

File tree

sdk/identity/azure-identity/azure/identity/_credentials/azure_pipelines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def build_oidc_request(service_connection_id: str) -> HttpRequest:
2424
base_uri = os.environ[ev.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI].rstrip("/")
2525
url = (
2626
f"{base_uri}/{os.environ[ev.SYSTEM_TEAMPROJECTID]}/_apis/distributedtask/hubs/build/plans/"
27-
f"{os.environ[ev.SYSTEM_PLANID]}/jobs/{os.environ[ev.SYSTEM_JOBID]}/oidctoken"
27+
f"{os.environ[ev.SYSTEM_PLANID]}/jobs/{os.environ[ev.SYSTEM_JOBID]}/oidctoken?"
2828
f"api-version={OIDC_API_VERSION}&serviceConnectionId={service_connection_id}"
2929
)
3030
access_token = os.environ[ev.SYSTEM_ACCESSTOKEN]

sdk/identity/azure-identity/tests/test_azure_pipelines_credential.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,15 @@ def test_azure_pipelines_credential_missing_env_var():
9191
def test_azure_pipelines_credential_in_chain():
9292
mock_credential = MagicMock()
9393

94-
chain_credential = ChainedTokenCredential(
95-
AzurePipelinesCredential(tenant_id="tenant-id", client_id="client-id", service_connection_id="connection-id"),
96-
mock_credential,
97-
)
98-
99-
chain_credential.get_token("scope")
100-
assert mock_credential.get_token.called
94+
with patch.dict("os.environ", {}, clear=True):
95+
chain_credential = ChainedTokenCredential(
96+
AzurePipelinesCredential(
97+
tenant_id="tenant-id", client_id="client-id", service_connection_id="connection-id"
98+
),
99+
mock_credential,
100+
)
101+
chain_credential.get_token("scope")
102+
assert mock_credential.get_token.called
101103

102104

103105
@pytest.mark.live_test_only("Requires Azure Pipelines environment with configured service connection")

sdk/identity/azure-identity/tests/test_azure_pipelines_credential_async.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ async def test_azure_pipelines_credential_missing_env_var():
6565
async def test_azure_pipelines_credential_in_chain():
6666
mock_credential = AsyncMock()
6767

68-
chain_credential = ChainedTokenCredential(
69-
AzurePipelinesCredential(tenant_id="tenant-id", client_id="client-id", service_connection_id="connection-id"),
70-
mock_credential,
71-
)
72-
73-
await chain_credential.get_token("scope")
74-
assert mock_credential.get_token.called
68+
with patch.dict("os.environ", {}, clear=True):
69+
chain_credential = ChainedTokenCredential(
70+
AzurePipelinesCredential(
71+
tenant_id="tenant-id", client_id="client-id", service_connection_id="connection-id"
72+
),
73+
mock_credential,
74+
)
75+
await chain_credential.get_token("scope")
76+
assert mock_credential.get_token.called
7577

7678

7779
@pytest.mark.asyncio

0 commit comments

Comments
 (0)