QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-11 19:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Adds missing __init__ file to commands/logs (#33059)

Browse Source 
(cherry picked from commit c1159c53e3)
This commit is contained in:
Michael S. Molina
2025-04-09 16:39:32 -03:00
committed by Michael S. Molina
parent e0e2d329e0
commit d0355d57bf
2 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/unit_tests/commands/databases/update_test.py
View File

@@ -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",