chore: enforce more ruff rules (#31447)

Co-authored-by: Elizabeth Thompson <eschutho@gmail.com>
This commit is contained in:
Maxime Beauchemin
2024-12-18 17:41:34 -08:00
committed by GitHub
parent 9da65d6bfd
commit e51b95ffa8
375 changed files with 1821 additions and 1718 deletions

View File

@@ -35,7 +35,7 @@ oauth2_client_info = {
}
@pytest.fixture()
@pytest.fixture
def database_with_catalog(mocker: MockerFixture) -> MagicMock:
"""
Mock a database with catalogs and schemas.
@@ -54,7 +54,7 @@ def database_with_catalog(mocker: MockerFixture) -> MagicMock:
return database
@pytest.fixture()
@pytest.fixture
def database_without_catalog(mocker: MockerFixture) -> MagicMock:
"""
Mock a database without catalogs.
@@ -68,7 +68,7 @@ def database_without_catalog(mocker: MockerFixture) -> MagicMock:
return database
@pytest.fixture()
@pytest.fixture
def database_needs_oauth2(mocker: MockerFixture) -> MagicMock:
"""
Mock a database without catalogs that needs OAuth2.
@@ -106,7 +106,7 @@ 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")
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
@@ -156,8 +156,8 @@ def test_update_without_catalog(
When update is called, only `schema2` has permissions associated with it, so `schema1`
is added.
"""
DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
""" # 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
@@ -202,7 +202,7 @@ 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")
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
@@ -212,7 +212,7 @@ def test_rename_with_catalog(
dataset = mocker.MagicMock()
chart = mocker.MagicMock()
DatabaseDAO.get_datasets.return_value = [dataset]
DatasetDAO = mocker.patch("superset.commands.database.update.DatasetDAO")
DatasetDAO = mocker.patch("superset.commands.database.update.DatasetDAO") # noqa: N806
DatasetDAO.get_related_objects.return_value = {"charts": [chart]}
find_permission_view_menu = mocker.patch.object(
@@ -273,8 +273,8 @@ 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`.
"""
DatabaseDAO = mocker.patch("superset.commands.database.update.DatabaseDAO")
""" # noqa: E501
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
@@ -315,7 +315,7 @@ 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")
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
@@ -349,7 +349,7 @@ 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")
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