Skip to content

Commit f43860f

Browse files
Gavin AguiarGavin Aguiar
authored andcommitted
Address comments
1 parent 23b6ea7 commit f43860f

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

azure_functions_worker/extension.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def function_load_extension(cls, func_name, func_directory):
6565
sdk = cls._try_get_sdk_with_extension_enabled()
6666
if sdk is None:
6767
return
68-
logger.info("Sdk path: %s", sdk.__file__)
68+
6969
# Reports application & function extensions installed on customer's app
7070
cls._info_discover_extension_list(func_name, sdk)
7171

@@ -236,9 +236,8 @@ def _try_get_sdk_with_extension_enabled(cls) -> Optional[ModuleType]:
236236
@classmethod
237237
def _info_extension_is_enabled(cls, sdk):
238238
logger.info(
239-
'Python Worker Extension is enabled in azure.functions (%s).',
240-
get_sdk_version(sdk)
241-
)
239+
'Python Worker Extension is enabled in azure.functions (%s). '
240+
'Sdk path: %s', get_sdk_version(sdk), sdk.__file__)
242241

243242
@classmethod
244243
def _info_discover_extension_list(cls, function_name, sdk):

tests/unittests/test_dispatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def setUp(self, version=SysVersionInfo(3, 7, 0, 'final', 0)):
4444
script_root=DISPATCHER_FUNCTIONS_DIR)
4545
self._default_workers: Optional[
4646
int] = PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT
47+
self._over_max_workers: int = 10000
4748
self._allowed_max_workers: int = PYTHON_THREADPOOL_THREAD_COUNT_MAX_37
4849
self._pre_env = dict(os.environ)
4950
self.mock_version_info = patch(
@@ -451,7 +452,6 @@ async def _check_if_async_function_is_ok(self, host) -> Tuple[str, str]:
451452
class TestThreadPoolSettingsPython38(TestThreadPoolSettingsPython37):
452453
def setUp(self, version=SysVersionInfo(3, 8, 0, 'final', 0)):
453454
super(TestThreadPoolSettingsPython38, self).setUp(version)
454-
self._over_max_workers: int = 10000
455455
self._allowed_max_workers: int = self._over_max_workers
456456

457457
def tearDown(self):

tests/unittests/test_extension.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def setUp(self):
5757
'resources',
5858
'mock_azure_functions'
5959
)
60+
self._dummy_sdk = Mock(__file__="test")
6061

6162
# Initialize mock context
6263
self._mock_arguments = {'req': 'request'}
@@ -113,7 +114,8 @@ def test_extension_if_sdk_not_in_path(self):
113114
sdk_enabled = self._instance._is_extension_enabled_in_sdk(module)
114115
self.assertTrue(sdk_enabled)
115116

116-
@patch('azure_functions_worker.extension.get_sdk_from_sys_path')
117+
@patch('azure_functions_worker.extension.get_sdk_from_sys_path',
118+
return_value=importlib.import_module('azure.functions'))
117119
def test_function_load_extension_enable_when_feature_flag_is_on(
118120
self,
119121
get_sdk_from_sys_path_mock: Mock
@@ -185,7 +187,8 @@ def test_function_load_extension_should_invoke_extension_call(
185187
any_order=True
186188
)
187189

188-
@patch('azure_functions_worker.extension.get_sdk_from_sys_path')
190+
@patch('azure_functions_worker.extension.get_sdk_from_sys_path',
191+
return_value=importlib.import_module('azure.functions'))
189192
def test_invocation_extension_enable_when_feature_flag_is_on(
190193
self,
191194
get_sdk_from_sys_path_mock: Mock
@@ -719,7 +722,7 @@ def test_info_extension_is_enabled(self, info_mock: Mock):
719722
self._instance._info_extension_is_enabled(sdk)
720723
info_mock.assert_called_once_with(
721724
'Python Worker Extension is enabled in azure.functions '
722-
'(%s).', sdk.__version__
725+
'(%s). Sdk path: %s', sdk.__version__, sdk.__file__
723726
)
724727

725728
@patch('azure_functions_worker.extension.logger.info')

tests/unittests/test_utilities.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ def test_get_sdk_dummy_version(self):
364364
module = common.get_sdk_from_sys_path()
365365
sdk_version = common.get_sdk_version(module)
366366
self.assertNotEqual(sdk_version, 'dummy')
367+
367368
def test_get_sdk_dummy_version_with_flag_enabled(self):
368369
"""Test if sdk version can get dummy sdk version
369370
"""

0 commit comments

Comments
 (0)