Skip to content

Commit feccec0

Browse files
committed
sync with ADO branch
1 parent f62cbf9 commit feccec0

File tree

3 files changed

+6
-47
lines changed

3 files changed

+6
-47
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
python -m pip install --pre -U -e .[test-http-v2]
3333
fi
3434
35-
# Retry a couple times to avoid certificate issue
3635
python setup.py build
3736
python setup.py webhost --branch-name=dev
3837
python setup.py extension

eng/templates/official/jobs/ci-lc-tests.yml

-40
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,18 @@ jobs:
1212
Python37:
1313
PYTHON_VERSION: '3.7'
1414
STORAGE_CONNECTION: $(LinuxStorageConnectionString37)
15-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString37)
16-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString37)
17-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString37)
18-
SQL_CONNECTION: $(LinuxSqlConnectionString37)
19-
EVENTGRID_URI: $(LinuxEventGridTopicUriString37)
20-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString37)
2115
Python38:
2216
PYTHON_VERSION: '3.8'
2317
STORAGE_CONNECTION: $(LinuxStorageConnectionString38)
24-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString38)
25-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString38)
26-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString38)
27-
SQL_CONNECTION: $(LinuxSqlConnectionString38)
28-
EVENTGRID_URI: $(LinuxEventGridTopicUriString38)
29-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString38)
3018
Python39:
3119
PYTHON_VERSION: '3.9'
3220
STORAGE_CONNECTION: $(LinuxStorageConnectionString39)
33-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString39)
34-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString39)
35-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString39)
36-
SQL_CONNECTION: $(LinuxSqlConnectionString39)
37-
EVENTGRID_URI: $(LinuxEventGridTopicUriString39)
38-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString39)
3921
Python310:
4022
PYTHON_VERSION: '3.10'
4123
STORAGE_CONNECTION: $(LinuxStorageConnectionString310)
42-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString310)
43-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString310)
44-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString310)
45-
SQL_CONNECTION: $(LinuxSqlConnectionString310)
46-
EVENTGRID_URI: $(LinuxEventGridTopicUriString310)
47-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString310)
4824
Python311:
4925
PYTHON_VERSION: '3.11'
5026
STORAGE_CONNECTION: $(LinuxStorageConnectionString311)
51-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString311)
52-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString311)
53-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString311)
54-
SQL_CONNECTION: $(LinuxSqlConnectionString311)
55-
EVENTGRID_URI: $(LinuxEventGridTopicUriString311)
56-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString311)
5727

5828
steps:
5929
- task: UsePythonVersion@0
@@ -67,21 +37,11 @@ jobs:
6737
if [[ $(PYTHON_VERSION) != "3.7" ]]; then
6838
python -m pip install --pre -U -e .[test-http-v2]
6939
fi
70-
if [[ $(PYTHON_VERSION) != "3.7" && $(PYTHON_VERSION) != "3.8" ]]; then
71-
python -m pip install --pre -U -e .[test-deferred-bindings]
72-
fi
7340
74-
# Retry a couple times to avoid certificate issue
7541
python setup.py build
7642
displayName: 'Install dependencies and the worker'
7743
- bash: |
7844
python -m pytest -n auto --dist loadfile -vv --reruns 4 --instafail tests/consumption_tests
7945
env:
8046
AzureWebJobsStorage: $(STORAGE_CONNECTION)
81-
AzureWebJobsCosmosDBConnectionString: $(COSMOSDB_CONNECTION)
82-
AzureWebJobsEventHubConnectionString: $(EVENTHUB_CONNECTION)
83-
AzureWebJobsServiceBusConnectionString: $(SERVICEBUS_CONNECTION)
84-
AzureWebJobsSqlConnectionString: $(SQL_CONNECTION)
85-
AzureWebJobsEventGridTopicUri: $(EVENTGRID_URI)
86-
AzureWebJobsEventGridConnectionKey: $(EVENTGRID_CONNECTION)
8747
displayName: "Running $(PYTHON_VERSION) Linux Consumption tests"

tests/extension_tests/http_v2_tests/test_http_v2.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
# Licensed under the MIT License.
33
import concurrent
44
import os
5+
import sys
6+
import unittest
57
from concurrent.futures import ThreadPoolExecutor
68

79
import requests
810

9-
from azure_functions_worker.constants import (
10-
PYTHON_ENABLE_INIT_INDEXING, PYTHON_ISOLATE_WORKER_DEPENDENCIES)
11+
from azure_functions_worker.constants import PYTHON_ENABLE_INIT_INDEXING
1112
from tests.utils import testutils
1213

1314
REQUEST_TIMEOUT_SEC = 5
1415

1516

16-
class TestHttpV2FunctionsWithInitIndexing(testutils.WebHostTestCase):
17+
@unittest.skipIf(sys.version_info.minor < 8, "HTTPv2"
18+
"is only supported for 3.8+.")
19+
class TestHttpFunctionsWithInitIndexing(testutils.WebHostTestCase):
1720
@classmethod
1821
def setUpClass(cls):
1922
cls.env_variables[PYTHON_ENABLE_INIT_INDEXING] = '1'
20-
cls.env_variables[PYTHON_ISOLATE_WORKER_DEPENDENCIES] = '1'
2123
os.environ[PYTHON_ENABLE_INIT_INDEXING] = "1"
22-
os.environ[PYTHON_ISOLATE_WORKER_DEPENDENCIES] = "1"
2324
super().setUpClass()
2425

2526
@classmethod
2627
def tearDownClass(cls):
2728
os.environ.pop(PYTHON_ENABLE_INIT_INDEXING)
28-
os.environ.pop(PYTHON_ISOLATE_WORKER_DEPENDENCIES)
2929
super().tearDownClass()
3030

3131
@classmethod

0 commit comments

Comments
 (0)