diff --git a/scripts/devops_tasks/test_run_samples.py b/scripts/devops_tasks/test_run_samples.py index 28f749c9d8ba..4b31c526fba5 100644 --- a/scripts/devops_tasks/test_run_samples.py +++ b/scripts/devops_tasks/test_run_samples.py @@ -21,7 +21,12 @@ root_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..")) IGNORED_SAMPLES = { - "azure-eventgrid": ["__init__.py"] + "azure-eventgrid": [ + "__init__.py", + "consume_cloud_events_from_eventhub.py", + "consume_cloud_events_from_service_bus_queue.py", + "consume_cloud_events_from_storage_queue.py", + "cs2_publish_custom_events_to_a_domain_topic.py"] } diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs3_consume_system_events.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs3_consume_system_events.py index 99a84312f8c2..f1e0eae3a1e7 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs3_consume_system_events.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs3_consume_system_events.py @@ -15,8 +15,9 @@ from azure.eventgrid import EventGridConsumer consumer = EventGridConsumer() +path = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "./cs3_system_event.json")) -with open('./cs3_event_grid_event_system_event.json', 'r') as f: +with open(path, 'r') as f: eg_event_received_message = json.loads(f.read()) # returns List[DeserializedEvent] event = consumer.decode_eventgrid_event(eg_event_received_message) diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs4_consume_custom_events.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs4_consume_custom_events.py index 47ff341e2656..73431fe0b8e3 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs4_consume_custom_events.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs4_consume_custom_events.py @@ -15,8 +15,9 @@ from azure.eventgrid import EventGridConsumer consumer = EventGridConsumer() +path = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "./cs4_event_grid_event_custom_event.json")) -with open('./cs4_event_grid_event_custom_event.json', 'r') as f: +with open(path, 'r') as f: eg_event_received_message = json.loads(f.read()) # returns List[DeserializedEvent] diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs6_consume_events_using_cloud_events_1.0_schema.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs6_consume_events_using_cloud_events_1.0_schema.py index edc1a48a6ca7..7c6525901d09 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs6_consume_events_using_cloud_events_1.0_schema.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs6_consume_events_using_cloud_events_1.0_schema.py @@ -15,8 +15,9 @@ from azure.eventgrid import EventGridConsumer consumer = EventGridConsumer() +path = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "./cs6_cloud_event_system_event.json")) -with open('./cs6_cloud_event_system_event.json', 'r') as f: +with open(path, 'r') as f: cloud_event_received_message = json.loads(f.read()) # returns List[DeserializedEvent] diff --git a/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_cloud_custom_data_sample.py b/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_cloud_custom_data_sample.py index 5b34177d5792..71df3ea7ad38 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_cloud_custom_data_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_cloud_custom_data_sample.py @@ -24,7 +24,7 @@ "specversion":"1.0" } cloud_custom_string = json.dumps(cloud_custom_dict) -cloud_custom_bytes = bytes(cloud_custom_string, "utf-8") +cloud_custom_bytes = str(cloud_custom_string).encode("utf-8") client = EventGridConsumer() deserialized_dict_event = client.decode_cloud_event(cloud_custom_dict) diff --git a/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py b/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py index f5c24b5a0cea..a81195f0b4a2 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py @@ -39,7 +39,7 @@ } eg_storage_string = json.dumps(eg_storage_dict) -eg_storage_bytes = bytes(eg_storage_string, "utf-8") +eg_storage_bytes = str(eg_storage_string).encode("utf-8") client = EventGridConsumer() deserialized_dict_event = client.decode_eventgrid_event(eg_storage_dict) diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py index c538cd235d73..6f6fda72a458 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py @@ -33,7 +33,7 @@ def publish_event(): # publish events - for _ in range(10): + for _ in range(3): event_list = [] # list of events to publish # create events and append to list for j in range(randint(1, 1)): diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py index 54b5d23b1c8b..1466e6d797d1 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py @@ -35,7 +35,7 @@ def publish_event(): # publish events - for _ in range(10): + for _ in range(3): event_list = [] # list of events to publish team_members = ["Josh", "Kerri", "Kieran", "Laurent", "Lily", "Matt", "Soren", "Srikanta", "Swathi"] # possible values for data field diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py index 4396938d8ee1..09b859093f0f 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py @@ -42,7 +42,7 @@ def publish_event(): } # publish events - for _ in range(10): + for _ in range(3): event_list = [] # list of events to publish # create events and append to list diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py index d10b5ca6e76e..744f4c064eb0 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py @@ -33,7 +33,7 @@ def publish_event(): # publish events - while True: + for _ in range(3): event_list = [] # list of events to publish # create events and append to list diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py index 3ee0a73dae61..e02bd9d60e99 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py @@ -37,7 +37,7 @@ def publish_event(): # publish events - for _ in range(10): + for _ in range(3): event_list = [] # list of events to publish # create events and append to list diff --git a/sdk/eventgrid/tests.yml b/sdk/eventgrid/tests.yml index 63a52997e72a..c7f21b4c7839 100644 --- a/sdk/eventgrid/tests.yml +++ b/sdk/eventgrid/tests.yml @@ -5,8 +5,18 @@ jobs: parameters: ServiceDirectory: eventgrid BuildTargetingString: azure-eventgrid* + TestSamples: true EnvVars: AZURE_SUBSCRIPTION_ID: $(azure-subscription-id) AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) - AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) \ No newline at end of file + AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) + EG_ACCESS_KEY: $(python-sdk-test-eg-access-key) + EG_TOPIC_HOSTNAME: $(python-sdk-test-eg-topic-hostname) + CLOUD_ACCESS_KEY: $(python-sdk-test-eg-cloud-access-key) + CLOUD_TOPIC_HOSTNAME: $(python-sdk-test-eg-cloud-topic-hostname) + DOMAIN_ACCESS_KEY: $(python-sdk-test-eg-domain-access-key) + DOMAIN_TOPIC_HOSTNAME: $(python-sdk-test-eg-domain-topic-hostname) + DOMAIN_NAME: $(python-sdk-test-eg-domain-name) + CUSTOM_SCHEMA_ACCESS_KEY: $(python-sdk-test-eg-custom-schema-access-key) + CUSTOM_SCHEMA_TOPIC_HOSTNAME: $(python-sdk-test-custom-schema-topic-hostname)