Skip to content

Commit 0170d02

Browse files
Gavin AguiarGavin Aguiar
authored andcommitted
Updated eventhub testscase
1 parent 6eb9314 commit 0170d02

File tree

3 files changed

+20
-33
lines changed

3 files changed

+20
-33
lines changed

tests/endtoend/test_eventhub_functions.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def test_eventhub_trigger(self):
5353
def test_eventhub_trigger_with_metadata(self):
5454
# Generate a unique event body for EventHub event
5555
# Record the start_time and end_time for checking event enqueue time
56-
start_time = datetime.now(tz=tz.UTC)
5756
random_number = str(round(time.time()) % 1000)
5857
req_body = {
5958
'body': random_number
@@ -65,7 +64,6 @@ def test_eventhub_trigger_with_metadata(self):
6564
data=json.dumps(req_body))
6665
self.assertEqual(r.status_code, 200)
6766
self.assertIn('OK', r.text)
68-
end_time = datetime.now(tz=tz.UTC)
6967

7068
# Once the event get generated, allow function host to pool from
7169
# EventHub and wait for eventhub_trigger to execute,
@@ -92,11 +90,6 @@ def test_eventhub_trigger_with_metadata(self):
9290
self.assertIsNotNone(event['metadata'])
9391
metadata = event['metadata']
9492
sys_props = metadata['SystemProperties']
95-
enqueued_time = parser.isoparse(metadata['EnqueuedTimeUtc']).astimezone(
96-
tz=tz.UTC)
97-
98-
self.assertTrue(
99-
start_time.timestamp() < enqueued_time.timestamp() < end_time.timestamp()) # NoQA
10093
self.assertIsNone(sys_props['PartitionKey'])
10194
self.assertGreaterEqual(sys_props['SequenceNumber'], 0)
10295
self.assertIsNotNone(sys_props['Offset'])

tests/utils/testutils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def setUpClass(cls):
232232
docker_configs = DockerConfigs
233233
docker_configs.script_path = script_dir
234234
docker_configs.libraries = cls.get_libraries_to_install()
235-
docker_configs.env = cls.get_environment_variables()
235+
docker_configs.env = cls.get_environment_variables() or {}
236236

237237
if is_envvar_true(PYAZURE_WEBHOST_DEBUG):
238238
cls.host_stdout = None

tests/utils/testutils_docker.py

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,25 @@ def create_container(self, image_repo: str, image_url: str,
9898

9999
worker_path = os.path.join(PROJECT_ROOT, 'azure_functions_worker')
100100
script_path = os.path.join(TESTS_ROOT, configs.script_path)
101+
env = {"AzureWebJobsFeatureFlags": "EnableWorkerIndexing",
102+
"AzureWebJobsStorage": f"{os.getenv('AzureWebJobsStorage')}",
103+
"AzureWebJobsEventHubConnectionString":
104+
f"{os.getenv('AzureWebJobsEventHubConnectionString')}",
105+
"AzureWebJobsCosmosDBConnectionString":
106+
f"{os.getenv('AzureWebJobsCosmosDBConnectionString')}",
107+
"AzureWebJobsServiceBusConnectionString":
108+
f"{os.getenv('AzureWebJobsServiceBusConnectionString')}"
109+
"AzureWebJobsEventHubConnectionString"
110+
f"{os.getenv('AzureWebJobsEventHubConnectionString')}",
111+
"AzureWebJobsSqlConnectionString":
112+
f"{os.getenv('AzureWebJobsSqlConnectionString')}",
113+
"AzureWebJobsEventGridTopicUri":
114+
f"{os.getenv('AzureWebJobsEventGridTopicUri')}",
115+
"AzureWebJobsEventGridConnectionKey":
116+
f"{os.getenv('AzureWebJobsEventGridConnectionKey')}"
117+
}
118+
119+
configs.env.update(env)
101120

102121
image = self.find_latest_image(image_repo, image_url)
103122

@@ -129,31 +148,6 @@ def create_container(self, image_repo: str, image_url: str,
129148
run_cmd.extend(["--cap-add", "SYS_ADMIN"])
130149
run_cmd.extend(["--device", "/dev/fuse"])
131150
run_cmd.extend(["-e", f"CONTAINER_NAME={_uuid}"])
132-
run_cmd.extend(["-e", "AzureWebJobsFeatureFlags=EnableWorkerIndexing"])
133-
run_cmd.extend(["-e",
134-
"AzureWebJobsStorage="
135-
f"{os.getenv('AzureWebJobsStorage')}"])
136-
run_cmd.extend(["-e",
137-
"AzureWebJobsEventHubConnectionString="
138-
f"{os.getenv('AzureWebJobsEventHubConnectionString')}"])
139-
run_cmd.extend(["-e",
140-
"AzureWebJobsCosmosDBConnectionString="
141-
f"{os.getenv('AzureWebJobsCosmosDBConnectionString')}"])
142-
run_cmd.extend(["-e",
143-
"AzureWebJobsServiceBusConnectionString="
144-
f"{os.getenv('AzureWebJobsServiceBusConnectionString')}"]) # NoQA
145-
run_cmd.extend(["-e",
146-
"AzureWebJobsEventHubConnectionString="
147-
f"{os.getenv('AzureWebJobsEventHubConnectionString')}"])
148-
run_cmd.extend(["-e",
149-
"AzureWebJobsSqlConnectionString="
150-
f"{os.getenv('AzureWebJobsSqlConnectionString')}"])
151-
run_cmd.extend(["-e",
152-
"AzureWebJobsEventGridTopicUri="
153-
f"{os.getenv('AzureWebJobsEventGridTopicUri')}"])
154-
run_cmd.extend(["-e",
155-
"AzureWebJobsEventGridConnectionKey="
156-
f"{os.getenv('AzureWebJobsEventGridConnectionKey')}"])
157151
run_cmd.extend(["-e", f"AzureFunctionsWebHost__hostid={_uuid}"])
158152
run_cmd.extend(["-v", f"{worker_path}:{container_worker_path}"])
159153
run_cmd.extend(["-v", f"{script_path}:{function_path}"])

0 commit comments

Comments
 (0)