Skip to content

Commit b73bd9e

Browse files
l0lawrencel0lawrence
committed
[EG] Update tests (Azure#35752)
* test * typo * update recordings * mark live * kwarg fix * updates * revert * kwargs * continue skip
1 parent 6186af3 commit b73bd9e

9 files changed

+52
-93
lines changed

‎sdk/eventgrid/azure-eventgrid/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/eventgrid/azure-eventgrid",
5-
"Tag": "python/eventgrid/azure-eventgrid_f155c8ac2d"
5+
"Tag": "python/eventgrid/azure-eventgrid_3ae14bceff"
66
}

‎sdk/eventgrid/azure-eventgrid/tests/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def add_sanitizers(test_proxy):
5151
add_remove_header_sanitizer(headers="aeg-sas-key, aeg-sas-token, aeg-channel-name")
5252
add_general_regex_sanitizer(
5353
value="fakeresource",
54-
regex="(?<=\\/\\/)[.*]+(?=\\.eastus-1\\.eventgrid\\.azure\\.net/api/events)",
54+
regex="(?<=\\/\\/)[a-z-]+(?=\\.eastus-1\\.eventgrid\\.azure\\.net/api/events)"
5555
)
5656

5757
add_oauth_response_sanitizer()

‎sdk/eventgrid/azure-eventgrid/tests/eventgrid_preparer.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import functools
2-
from devtools_testutils import PowerShellPreparer, EnvironmentVariableLoader
2+
from devtools_testutils import EnvironmentVariableLoader
33

44
from azure.mgmt.eventgrid.models import (
55
Topic,
@@ -9,8 +9,8 @@
99
JsonFieldWithDefault,
1010
)
1111

12-
EVENTGRID_TOPIC_PARAM = "eventgrid_topic"
13-
EVENTGRID_TOPIC_LOCATION = "eastus"
12+
EVENTGRID_TOPIC_PARAM = 'eventgrid_topic'
13+
EVENTGRID_TOPIC_LOCATION = 'westus'
1414
CLOUD_EVENT_SCHEMA = InputSchema.cloud_event_schema_v1_0
1515
CUSTOM_EVENT_SCHEMA = InputSchema.custom_event_schema
1616
ID_JSON_FIELD = JsonField(source_field="customId")
@@ -29,8 +29,7 @@
2929
)
3030

3131
EventGridPreparer = functools.partial(
32-
PowerShellPreparer,
33-
"eventgrid",
32+
EnvironmentVariableLoader, "eventgrid",
3433
eventgrid_topic_endpoint="https://fakeresource.eastus-1.eventgrid.azure.net/api/events",
3534
eventgrid_topic_key="fakekeyfakekeyfakekeyfakekeyfakekeyfakekeyA=",
3635
eventgrid_domain_endpoint="https://fakeresource.eastus-1.eventgrid.azure.net/api/events",

‎sdk/eventgrid/azure-eventgrid/tests/test_cncf_events.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import json
22
from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy
33

4-
from azure.core.credentials import AzureKeyCredential, AzureSasCredential
54
from azure.eventgrid import EventGridPublisherClient
65
from cloudevents.http import CloudEvent
76

‎sdk/eventgrid/azure-eventgrid/tests/test_cncf_events_async.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import json
22
import pytest
3-
from devtools_testutils import AzureRecordedTestCase, CachedResourceGroupPreparer
3+
from devtools_testutils import AzureRecordedTestCase
44
from devtools_testutils.aio import recorded_by_proxy_async
55

6-
from azure.core.credentials import AzureKeyCredential, AzureSasCredential
76
from azure.eventgrid.aio import EventGridPublisherClient
87
from cloudevents.http import CloudEvent
98

‎sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy
2323

24-
from azure.core.credentials import AzureKeyCredential, AzureSasCredential
24+
from azure.core.credentials import AzureSasCredential
2525
from azure.core.messaging import CloudEvent
2626
from azure.core.serialization import NULL
2727
from azure.eventgrid import EventGridPublisherClient, EventGridEvent, generate_sas
@@ -54,10 +54,10 @@ def test_send_event_grid_event_data_dict(self, eventgrid_topic_endpoint):
5454

5555
@EventGridPreparer()
5656
@recorded_by_proxy
57-
def test_send_event_grid_event_fails_without_full_url(self, eventgrid_topic_key, eventgrid_topic_endpoint):
58-
akc_credential = AzureKeyCredential(eventgrid_topic_key)
57+
def test_send_event_grid_event_fails_without_full_url(self,eventgrid_topic_endpoint):
58+
credential = self.get_credential(EventGridPublisherClient)
5959
parsed_url = urlparse(eventgrid_topic_endpoint)
60-
client = EventGridPublisherClient(parsed_url.netloc, akc_credential)
60+
client = EventGridPublisherClient(parsed_url.netloc, credential)
6161
eg_event = EventGridEvent(
6262
subject="sample",
6363
data={"sample": "eventgridevent"},
@@ -273,9 +273,11 @@ def test_send_cloud_event_dict(self, eventgrid_cloud_event_topic_endpoint):
273273
}
274274
client.send(cloud_event1)
275275

276+
@pytest.mark.live_test_only
276277
@EventGridPreparer()
277-
@recorded_by_proxy
278-
def test_send_signature_credential(self, eventgrid_topic_key, eventgrid_topic_endpoint):
278+
def test_send_signature_credential(self, **kwargs):
279+
eventgrid_topic_endpoint = kwargs.pop("eventgrid_topic_endpoint")
280+
eventgrid_topic_key = kwargs.pop("eventgrid_topic_key")
279281
expiration_date_utc = dt.datetime.now(UTC()) + timedelta(hours=1)
280282
signature = generate_sas(eventgrid_topic_endpoint, eventgrid_topic_key, expiration_date_utc)
281283
credential = AzureSasCredential(signature)
@@ -355,14 +357,8 @@ def test_send_token_credential(self, eventgrid_topic_endpoint):
355357
@pytest.mark.live_test_only
356358
@EventGridPreparer()
357359
@recorded_by_proxy
358-
def test_send_partner_namespace(
359-
self,
360-
eventgrid_partner_namespace_topic_endpoint,
361-
eventgrid_partner_namespace_topic_key,
362-
eventgrid_partner_channel_name,
363-
):
364-
credential = AzureKeyCredential(eventgrid_partner_namespace_topic_key)
365-
client = EventGridPublisherClient(eventgrid_partner_namespace_topic_endpoint, credential)
360+
def test_send_partner_namespace(self, eventgrid_partner_namespace_topic_endpoint, eventgrid_partner_channel_name):
361+
client = self.create_eg_publisher_client(eventgrid_partner_namespace_topic_endpoint)
366362
cloud_event = CloudEvent(
367363
source="http://samplesource.dev",
368364
data="cloudevent",

‎sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from devtools_testutils import AzureRecordedTestCase
1919
from devtools_testutils.aio import recorded_by_proxy_async
2020

21-
from azure.core.credentials import AzureKeyCredential, AzureSasCredential
21+
from azure.core.credentials import AzureSasCredential
2222
from azure.core.messaging import CloudEvent
2323
from azure.core.serialization import NULL
2424
from azure.eventgrid import EventGridEvent, generate_sas
@@ -69,12 +69,10 @@ async def test_send_event_grid_event_data_as_list_async(self, eventgrid_topic_en
6969
@EventGridPreparer()
7070
@recorded_by_proxy_async
7171
@pytest.mark.asyncio
72-
async def test_send_event_grid_event_fails_without_full_url_async(
73-
self, eventgrid_topic_key, eventgrid_topic_endpoint
74-
):
75-
akc_credential = AzureKeyCredential(eventgrid_topic_key)
72+
async def test_send_event_grid_event_fails_without_full_url(self, eventgrid_topic_endpoint):
73+
credential = self.get_credential(EventGridPublisherClient, is_async=True)
7674
parsed_url = urlparse(eventgrid_topic_endpoint)
77-
client = EventGridPublisherClient(parsed_url.netloc, akc_credential)
75+
client = EventGridPublisherClient(parsed_url.netloc, credential)
7876
eg_event = EventGridEvent(
7977
subject="sample",
8078
data={"sample": "eventgridevent"},
@@ -234,10 +232,12 @@ def callback(request):
234232

235233
await client.send(cloud_event, raw_request_hook=callback)
236234

235+
@pytest.mark.live_test_only
237236
@EventGridPreparer()
238-
@recorded_by_proxy_async
239237
@pytest.mark.asyncio
240-
async def test_send_signature_credential_async(self, eventgrid_topic_key, eventgrid_topic_endpoint):
238+
async def test_send_signature_credential(self, **kwargs):
239+
eventgrid_topic_endpoint = kwargs.pop("eventgrid_topic_endpoint")
240+
eventgrid_topic_key = kwargs.pop("eventgrid_topic_key")
241241
expiration_date_utc = dt.datetime.now(UTC()) + timedelta(hours=1)
242242
signature = generate_sas(eventgrid_topic_endpoint, eventgrid_topic_key, expiration_date_utc)
243243
credential = AzureSasCredential(signature)
@@ -326,14 +326,9 @@ async def test_send_token_credential_async(self, eventgrid_topic_endpoint):
326326
@pytest.mark.live_test_only
327327
@EventGridPreparer()
328328
@recorded_by_proxy_async
329-
async def test_send_partner_namespace_async(
330-
self,
331-
eventgrid_partner_namespace_topic_endpoint,
332-
eventgrid_partner_namespace_topic_key,
333-
eventgrid_partner_channel_name,
334-
):
335-
credential = AzureKeyCredential(eventgrid_partner_namespace_topic_key)
336-
client = EventGridPublisherClient(eventgrid_partner_namespace_topic_endpoint, credential)
329+
@pytest.mark.asyncio
330+
async def test_send_partner_namespace(self, eventgrid_partner_namespace_topic_endpoint, eventgrid_partner_channel_name):
331+
client = self.create_eg_publisher_client(eventgrid_partner_namespace_topic_endpoint)
337332
cloud_event = CloudEvent(
338333
source="http://samplesource.dev",
339334
data="cloudevent",

‎sdk/eventgrid/azure-eventgrid/tests/test_exceptions.py‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,18 @@
44
# license information.
55
# --------------------------------------------------------------------------
66

7-
import logging
8-
import sys
97
import os
108
import json
119
import pytest
12-
import uuid
13-
from datetime import datetime, timedelta
1410
from azure.core.exceptions import (
1511
HttpResponseError,
1612
ClientAuthenticationError,
17-
ServiceRequestError,
1813
)
19-
from msrest.serialization import UTC
20-
import datetime as dt
21-
22-
try:
23-
from urllib.parse import urlparse
24-
except ImportError:
25-
from urlparse import urlparse
2614

2715
from devtools_testutils import AzureMgmtRecordedTestCase, recorded_by_proxy
2816

2917
from azure.core.credentials import AzureKeyCredential
3018
from azure.eventgrid import EventGridPublisherClient, EventGridEvent
31-
from azure.core.messaging import CloudEvent
3219

3320
from eventgrid_preparer import (
3421
EventGridPreparer,
@@ -41,9 +28,10 @@ def create_eg_publisher_client(self, endpoint):
4128
client = self.create_client_from_credential(EventGridPublisherClient, credential=credential, endpoint=endpoint)
4229
return client
4330

31+
@pytest.mark.live_test_only
4432
@EventGridPreparer()
45-
@recorded_by_proxy
46-
def test_raise_on_auth_error(self, eventgrid_topic_endpoint):
33+
def test_raise_on_auth_error(self, **kwargs):
34+
eventgrid_topic_endpoint = kwargs.pop("eventgrid_topic_endpoint")
4735
akc_credential = AzureKeyCredential("bad credential")
4836
client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential)
4937
eg_event = EventGridEvent(
@@ -60,18 +48,17 @@ def test_raise_on_auth_error(self, eventgrid_topic_endpoint):
6048

6149
@pytest.mark.skip("Fix during MQ - skip to unblock pipeline")
6250
@pytest.mark.live_test_only
63-
def test_raise_on_bad_resource(self):
64-
credential = AzureKeyCredential(os.environ["EVENTGRID_TOPIC_KEY"])
65-
client = EventGridPublisherClient(
66-
"https://bad-resource.eastus-1.eventgrid.azure.net/api/events",
67-
credential,
68-
)
69-
eg_event = CloudEvent(
70-
subject="sample",
71-
data={"sample": "eventgridevent"},
72-
source="source",
73-
type="Sample.Cloud.Event",
74-
)
51+
@EventGridPreparer()
52+
def test_raise_on_bad_resource(self, **kwargs):
53+
eventgrid_topic_key = kwargs.pop("eventgrid_topic_key")
54+
akc_credential = AzureKeyCredential(eventgrid_topic_key)
55+
client = EventGridPublisherClient("https://bad-resource.westus-1.eventgrid.azure.net/api/events", akc_credential)
56+
eg_event = EventGridEvent(
57+
subject="sample",
58+
data={"sample": "eventgridevent"},
59+
event_type="Sample.EventGrid.Event",
60+
data_version="2.0"
61+
)
7562
with pytest.raises(HttpResponseError):
7663
client.send(eg_event)
7764

‎sdk/eventgrid/azure-eventgrid/tests/test_exceptions_async.py‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,20 @@
44
# license information.
55
# --------------------------------------------------------------------------
66

7-
import logging
8-
import sys
97
import os
108
import json
119
import pytest
12-
import uuid
13-
from datetime import datetime, timedelta
14-
from azure.core.exceptions import (
15-
HttpResponseError,
16-
ClientAuthenticationError,
17-
ServiceRequestError,
18-
)
10+
from azure.core.exceptions import HttpResponseError, ClientAuthenticationError
1911
from msrest.serialization import UTC
2012
import datetime as dt
2113

22-
try:
23-
from urllib.parse import urlparse
24-
except ImportError:
25-
from urlparse import urlparse
2614

2715
from devtools_testutils import AzureRecordedTestCase
2816
from devtools_testutils.aio import recorded_by_proxy_async
2917

30-
from azure.core.credentials import AzureKeyCredential, AzureSasCredential
31-
from azure.core.messaging import CloudEvent
32-
from azure.core.serialization import NULL
33-
from azure.eventgrid import EventGridEvent, generate_sas
18+
from azure.core.credentials import AzureKeyCredential
19+
from azure.eventgrid import EventGridEvent
3420
from azure.eventgrid.aio import EventGridPublisherClient
35-
from azure.eventgrid._legacy._helpers import _cloud_event_to_generated
3621

3722
from eventgrid_preparer import (
3823
EventGridPreparer,
@@ -45,10 +30,11 @@ def create_eg_publisher_client(self, endpoint):
4530
client = self.create_client_from_credential(EventGridPublisherClient, credential=credential, endpoint=endpoint)
4631
return client
4732

33+
@pytest.mark.live_test_only
4834
@EventGridPreparer()
49-
@recorded_by_proxy_async
5035
@pytest.mark.asyncio
51-
async def test_raise_on_auth_error(self, eventgrid_topic_endpoint):
36+
async def test_raise_on_auth_error(self, **kwargs):
37+
eventgrid_topic_endpoint = kwargs.pop("eventgrid_topic_endpoint")
5238
akc_credential = AzureKeyCredential("bad credential")
5339
client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential)
5440
eg_event = EventGridEvent(
@@ -67,12 +53,10 @@ async def test_raise_on_auth_error(self, eventgrid_topic_endpoint):
6753
@pytest.mark.live_test_only
6854
@EventGridPreparer()
6955
@pytest.mark.asyncio
70-
async def test_raise_on_bad_resource(self):
71-
credential = AzureKeyCredential(os.environ["EVENTGRID_TOPIC_KEY"])
72-
client = EventGridPublisherClient(
73-
"https://bad-resource.eastus-1.eventgrid.azure.net/api/events",
74-
credential,
75-
)
56+
async def test_raise_on_bad_resource(self, **kwargs):
57+
eventgrid_topic_key = kwargs.pop("eventgrid_topic_key")
58+
akc_credential = AzureKeyCredential(eventgrid_topic_key)
59+
client = EventGridPublisherClient("https://bad-resource.westus-1.eventgrid.azure.net/api/events", akc_credential)
7660
eg_event = EventGridEvent(
7761
subject="sample",
7862
data={"sample": "eventgridevent"},

0 commit comments

Comments
 (0)