Skip to content

Commit 2a588a9

Browse files
committed
merge conflicts
2 parents 052bfb3 + 4dc9617 commit 2a588a9

File tree

16 files changed

+121
-104
lines changed

16 files changed

+121
-104
lines changed

eng/templates/jobs/ci-emulator-tests.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ jobs:
7878
eng/scripts/test-setup.sh
7979
displayName: 'Install test python extension, dependencies and the worker'
8080
condition: or(eq(variables.isExtensionsRelease, true), eq(variables['USETESTPYTHONEXTENSIONS'], true))
81+
- bash: |
82+
docker pull mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview
83+
docker run --detach --publish 8081:8081 --publish 1234:1234 mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview
84+
docker ps
85+
displayName: "Start CosmosDB Emulator"
8186
- bash: |
8287
docker compose -f ${{ parameters.PROJECT_DIRECTORY }}/tests/emulator_tests/utils/eventhub/docker-compose.yml pull
8388
docker compose -f ${{ parameters.PROJECT_DIRECTORY }}/tests/emulator_tests/utils/eventhub/docker-compose.yml up -d
@@ -86,7 +91,10 @@ jobs:
8691
python -m pytest -q -n auto --dist loadfile --reruns 4 --ignore=tests/emulator_tests/test_servicebus_functions.py tests/emulator_tests
8792
env:
8893
AzureWebJobsStorage: "UseDevelopmentStorage=true"
89-
AzureWebJobsEventHubConnectionString: "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
94+
AzureWebJobsEventHubConnectionString: $(EmulatorEventHubConnectionString)
95+
AzureWebJobsCosmosDBConnectionString: $(EmulatorCosmosDBConnectionString)
96+
CosmosDBEmulatorUrl: $(CosmosDBEmulatorUrl)
97+
CosmosDBEmulatorKey: $(CosmosDBEmulatorKey)
9098
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.PROJECT_DIRECTORY }}
9199
displayName: "Running $(PYTHON_VERSION) Python Linux Emulator Tests"
92100
- bash: |
@@ -102,6 +110,6 @@ jobs:
102110
python -m pytest -q -n auto --dist loadfile --reruns 4 tests/emulator_tests/test_servicebus_functions.py
103111
env:
104112
AzureWebJobsStorage: "UseDevelopmentStorage=true"
105-
AzureWebJobsServiceBusConnectionString: "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
113+
AzureWebJobsServiceBusConnectionString: $(EmulatorServiceBusConnectionString)
106114
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.PROJECT_DIRECTORY }}
107115
displayName: "Running $(PYTHON_VERSION) Python ServiceBus Linux Emulator Tests"

workers/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Repository = "https://github.com/Azure/azure-functions-python-worker"
5050

5151
[project.optional-dependencies]
5252
dev = [
53+
"azure-cosmos", # Used for CosmosDB Emulator tests
5354
"azure-eventhub", # Used for EventHub E2E tests
5455
"azure-functions-durable", # Used for Durable E2E tests
5556
"azure-monitor-opentelemetry; python_version >= '3.8'", # Used for Azure Monitor unit tests

0 commit comments

Comments
 (0)