This is an automated email from the ASF dual-hosted git repository.
dstandish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new c577d5d Fix providers manager tests (#22592)
c577d5d is described below
commit c577d5d60a4ac4d063a2954225ea7ad95b923ab2
Author: Daniel Standish <[email protected]>
AuthorDate: Tue Mar 29 12:01:31 2022 -0700
Fix providers manager tests (#22592)
PR #22579 suppressed provider import log warnings when running from
sources. For whatever reason, CI didn't run test_providers_manager.py so I
didn't catch that changes were needed there.
---
airflow/www/views.py | 6 +++---
tests/core/test_providers_manager.py | 20 ++++++++++++--------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/airflow/www/views.py b/airflow/www/views.py
index a9492e1..b6be95c 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -4094,12 +4094,12 @@ class ProviderView(AirflowBaseView):
providers = []
for pi in providers_manager.providers.values():
- provider_info = pi[1]
+ provider_info = pi.data
provider_data = {
"package_name": provider_info["package-name"],
"description":
self._clean_description(provider_info["description"]),
- "version": pi[0],
- "documentation_url":
get_doc_url_for_provider(provider_info["package-name"], pi[0]),
+ "version": pi.version,
+ "documentation_url":
get_doc_url_for_provider(provider_info["package-name"], pi.version),
}
providers.append(provider_data)
diff --git a/tests/core/test_providers_manager.py
b/tests/core/test_providers_manager.py
index b38ec8d..526c4b0 100644
--- a/tests/core/test_providers_manager.py
+++ b/tests/core/test_providers_manager.py
@@ -37,8 +37,8 @@ class TestProviderManager(unittest.TestCase):
provider_list = list(provider_manager.providers.keys())
# No need to sort the list - it should be sorted alphabetically !
for provider in provider_list:
- package_name =
provider_manager.providers[provider][1]['package-name']
- version = provider_manager.providers[provider][0]
+ package_name =
provider_manager.providers[provider].data['package-name']
+ version = provider_manager.providers[provider].version
assert re.search(r'[0-9]*\.[0-9]*\.[0-9]*.*', version)
assert package_name == provider
# just a coherence check - no exact number as otherwise we would
have to update
@@ -51,7 +51,8 @@ class TestProviderManager(unittest.TestCase):
providers_manager = ProvidersManager()
providers_manager._provider_dict['test-package'] = ProviderInfo(
version='0.0.1',
- provider_info={'hook-class-names':
['airflow.providers.sftp.hooks.sftp.SFTPHook']},
+ data={'hook-class-names':
['airflow.providers.sftp.hooks.sftp.SFTPHook']},
+ package_or_source='package',
)
providers_manager._discover_hooks()
assert warning_records
@@ -61,7 +62,7 @@ class TestProviderManager(unittest.TestCase):
providers_manager = ProvidersManager()
providers_manager._provider_dict['apache-airflow-providers-sftp']
= ProviderInfo(
version='0.0.1',
- provider_info={
+ data={
'hook-class-names':
['airflow.providers.sftp.hooks.sftp.SFTPHook'],
'connection-types': [
{
@@ -70,6 +71,7 @@ class TestProviderManager(unittest.TestCase):
}
],
},
+ package_or_source='package',
)
providers_manager._discover_hooks()
assert [] == [w.message for w in warning_records.list if
"hook-class-names" in str(w.message)]
@@ -79,7 +81,7 @@ class TestProviderManager(unittest.TestCase):
providers_manager = ProvidersManager()
providers_manager._provider_dict['apache-airflow-providers-sftp']
= ProviderInfo(
version='0.0.1',
- provider_info={
+ data={
'hook-class-names':
['airflow.providers.sftp.hooks.sftp.SFTPHook'],
'connection-types': [
{
@@ -88,6 +90,7 @@ class TestProviderManager(unittest.TestCase):
}
],
},
+ package_or_source='package',
)
providers_manager._discover_hooks()
_ = providers_manager._hooks_lazy_dict['wrong-connection-type']
@@ -100,7 +103,7 @@ class TestProviderManager(unittest.TestCase):
providers_manager = ProvidersManager()
providers_manager._provider_dict['apache-airflow-providers-sftp']
= ProviderInfo(
version='0.0.1',
- provider_info={
+ data={
'hook-class-names':
['airflow.providers.sftp.hooks.sftp.SFTPHook'],
'connection-types': [
{
@@ -109,6 +112,7 @@ class TestProviderManager(unittest.TestCase):
}
],
},
+ package_or_source='package',
)
providers_manager._discover_hooks()
_ = providers_manager._hooks_lazy_dict['sftp']
@@ -172,7 +176,7 @@ class TestProviderManager(unittest.TestCase):
package_name="test_package", hook_class_name="HookClass"
)
providers_manager._import_hook(
- hook_class_name=None, package_name=None,
connection_type="test_connection"
+ hook_class_name=None, provider_info=None, package_name=None,
connection_type="test_connection"
)
assert [] == self._caplog.messages
@@ -185,7 +189,7 @@ class TestProviderManager(unittest.TestCase):
package_name="test_package", hook_class_name="HookClass"
)
providers_manager._import_hook(
- hook_class_name=None, package_name=None,
connection_type="test_connection"
+ hook_class_name=None, provider_info=None, package_name=None,
connection_type="test_connection"
)
assert [
"Optional feature disabled on exception when importing
'HookClass' from "
