Skip to content

Fix providers manager tests #22592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dstandish merged 1 commit into from
Mar 29, 2022
Merged

Fix providers manager tests #22592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions airflow/www/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4094,12 +4094,12 @@ def list(self):

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)

Expand Down
20 changes: 12 additions & 8 deletions tests/core/test_providers_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def test_providers_are_loaded(self):
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
Expand All @@ -51,7 +51,8 @@ def test_hooks_deprecation_warnings_generated(self):
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
Expand All @@ -61,7 +62,7 @@ def test_hooks_deprecation_warnings_not_generated(self):
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': [
{
Expand All @@ -70,6 +71,7 @@ def test_hooks_deprecation_warnings_not_generated(self):
}
],
},
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)]
Expand All @@ -79,7 +81,7 @@ def test_warning_logs_generated(self):
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': [
{
Expand All @@ -88,6 +90,7 @@ def test_warning_logs_generated(self):
}
],
},
package_or_source='package',
)
providers_manager._discover_hooks()
_ = providers_manager._hooks_lazy_dict['wrong-connection-type']
Expand All @@ -100,7 +103,7 @@ def test_warning_logs_not_generated(self):
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': [
{
Expand All @@ -109,6 +112,7 @@ def test_warning_logs_not_generated(self):
}
],
},
package_or_source='package',
)
providers_manager._discover_hooks()
_ = providers_manager._hooks_lazy_dict['sftp']
Expand Down Expand Up @@ -172,7 +176,7 @@ def test_optional_feature_no_warning(self, mock_importlib_import_string):
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

Expand All @@ -185,7 +189,7 @@ def test_optional_feature_debug(self, mock_importlib_import_string):
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 "
Expand Down