This is an automated email from the ASF dual-hosted git repository. michaelsmolina pushed a commit to branch 5.0 in repository https://gitbox.apache.org/repos/asf/superset.git
commit d0355d57bfefc1028bb89400353f2f81108aba72 Author: Michael S. Molina <[email protected]> AuthorDate: Wed Apr 9 16:39:32 2025 -0300 fix: Adds missing __init__ file to commands/logs (#33059) (cherry picked from commit c1159c53e372fc24533bf342f3a673512fe46729) --- superset/commands/logs/__init__.py | 16 ++++++ tests/unit_tests/commands/databases/update_test.py | 62 +++++++++++----------- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/superset/commands/logs/__init__.py b/superset/commands/logs/__init__.py new file mode 100644 index 0000000000..13a83393a9 --- /dev/null +++ b/superset/commands/logs/__init__.py @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. diff --git a/tests/unit_tests/commands/databases/update_test.py b/tests/unit_tests/commands/databases/update_test.py index 7c9224bf5a..c2dd9b68bd 100644 --- a/tests/unit_tests/commands/databases/update_test.py +++ b/tests/unit_tests/commands/databases/update_test.py @@ -111,9 +111,9 @@ def test_update_with_catalog( When update is called, only `catalog2.schema3` has permissions associated with it, so `catalog1.*` and `catalog2.schema4` are added. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_with_catalog - DatabaseDAO.update.return_value = database_with_catalog + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_with_catalog + databaseDao.update.return_value = database_with_catalog find_permission_view_menu = mocker.patch.object( security_manager, @@ -162,9 +162,9 @@ def test_update_without_catalog( When update is called, only `schema2` has permissions associated with it, so `schema1` is added. """ # noqa: E501 - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_without_catalog - DatabaseDAO.update.return_value = database_without_catalog + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_without_catalog + databaseDao.update.return_value = database_without_catalog find_permission_view_menu = mocker.patch.object( security_manager, @@ -207,16 +207,16 @@ def test_rename_with_catalog( so `catalog1.*` and `catalog2.schema4` are added. Additionally, the database has been renamed from `my_db` to `my_other_db`. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 original_database = mocker.MagicMock() original_database.database_name = "my_db" - DatabaseDAO.find_by_id.return_value = original_database + databaseDao.find_by_id.return_value = original_database database_with_catalog.database_name = "my_other_db" - DatabaseDAO.update.return_value = database_with_catalog + databaseDao.update.return_value = database_with_catalog dataset = mocker.MagicMock() chart = mocker.MagicMock() - DatabaseDAO.get_datasets.return_value = [dataset] + databaseDao.get_datasets.return_value = [dataset] DatasetDAO = mocker.patch("superset.commands.database.update.DatasetDAO") # noqa: N806 DatasetDAO.get_related_objects.return_value = {"charts": [chart]} @@ -279,13 +279,13 @@ def test_rename_without_catalog( When update is called, only `schema2` has permissions associated with it, so `schema1` is added. Additionally, the database has been renamed from `my_db` to `my_other_db`. """ # noqa: E501 - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 original_database = mocker.MagicMock() original_database.database_name = "my_db" - DatabaseDAO.find_by_id.return_value = original_database + databaseDao.find_by_id.return_value = original_database database_without_catalog.database_name = "my_other_db" - DatabaseDAO.update.return_value = database_without_catalog - DatabaseDAO.get_datasets.return_value = [] + databaseDao.update.return_value = database_without_catalog + databaseDao.get_datasets.return_value = [] find_permission_view_menu = mocker.patch.object( security_manager, @@ -320,9 +320,9 @@ def test_update_with_oauth2( """ Test that the database can be updated even if OAuth2 is needed to connect. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_needs_oauth2 - DatabaseDAO.update.return_value = database_needs_oauth2 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_needs_oauth2 + databaseDao.update.return_value = database_needs_oauth2 find_permission_view_menu = mocker.patch.object( security_manager, @@ -350,9 +350,9 @@ def test_update_with_oauth2_changed( """ Test that the database can be updated even if OAuth2 is needed to connect. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_needs_oauth2 - DatabaseDAO.update.return_value = database_needs_oauth2 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_needs_oauth2 + databaseDao.update.return_value = database_needs_oauth2 find_permission_view_menu = mocker.patch.object( security_manager, @@ -390,9 +390,9 @@ def test_remove_oauth_config_purges_tokens( """ Test that removing the OAuth config from a database purges existing tokens. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_needs_oauth2 - DatabaseDAO.update.return_value = database_needs_oauth2 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_needs_oauth2 + databaseDao.update.return_value = database_needs_oauth2 find_permission_view_menu = mocker.patch.object( security_manager, @@ -425,9 +425,9 @@ def test_update_oauth2_removes_masked_encrypted_extra_key( """ Test that the ``masked_encrypted_extra`` key is properly purged from the properties. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_needs_oauth2 - DatabaseDAO.update.return_value = database_needs_oauth2 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_needs_oauth2 + databaseDao.update.return_value = database_needs_oauth2 find_permission_view_menu = mocker.patch.object( security_manager, @@ -456,7 +456,7 @@ def test_update_oauth2_removes_masked_encrypted_extra_key( add_permission_view_menu.assert_not_called() database_needs_oauth2.purge_oauth2_tokens.assert_called() - DatabaseDAO.update.assert_called_with( + databaseDao.update.assert_called_with( database_needs_oauth2, { "encrypted_extra": json.dumps( @@ -474,9 +474,9 @@ def test_update_other_fields_dont_affect_oauth( Test that not including ``masked_encrypted_extra`` in the payload does not touch the OAuth config. """ - DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 - DatabaseDAO.find_by_id.return_value = database_needs_oauth2 - DatabaseDAO.update.return_value = database_needs_oauth2 + databaseDao = mocker.patch("superset.commands.database.update.DatabaseDAO") # noqa: N806 + databaseDao.find_by_id.return_value = database_needs_oauth2 + databaseDao.update.return_value = database_needs_oauth2 find_permission_view_menu = mocker.patch.object( security_manager, @@ -512,7 +512,6 @@ def test_update_with_catalog_change(mocker: MockerFixture) -> None: database_dao.find_by_id.return_value = old_database database_dao.update.return_value = new_database - mocker.patch("superset.commands.database.update.SyncPermissionsCommand") mocker.patch.object( UpdateDatabaseCommand, "validate", @@ -544,7 +543,6 @@ def test_update_without_catalog_change(mocker: MockerFixture) -> None: database_dao.find_by_id.return_value = old_database database_dao.update.return_value = new_database - mocker.patch("superset.commands.database.update.SyncPermissionsCommand") mocker.patch.object( UpdateDatabaseCommand, "validate",
