mirror of
https://github.com/apache/superset.git
synced 2026-04-17 15:15:20 +00:00
chore(command): Organize Commands according to SIP-92 (#25850)
This commit is contained in:
@@ -396,7 +396,7 @@ def test_delete_ssh_tunnel(
|
||||
mocker.patch("sqlalchemy.engine.URL.get_driver_name", return_value="gsheets")
|
||||
mocker.patch("superset.utils.log.DBEventLogger.log")
|
||||
mocker.patch(
|
||||
"superset.databases.ssh_tunnel.commands.delete.is_feature_enabled",
|
||||
"superset.commands.database.ssh_tunnel.delete.is_feature_enabled",
|
||||
return_value=True,
|
||||
)
|
||||
|
||||
@@ -472,7 +472,7 @@ def test_delete_ssh_tunnel_not_found(
|
||||
mocker.patch("sqlalchemy.engine.URL.get_driver_name", return_value="gsheets")
|
||||
mocker.patch("superset.utils.log.DBEventLogger.log")
|
||||
mocker.patch(
|
||||
"superset.databases.ssh_tunnel.commands.delete.is_feature_enabled",
|
||||
"superset.commands.database.ssh_tunnel.delete.is_feature_enabled",
|
||||
return_value=True,
|
||||
)
|
||||
|
||||
@@ -559,7 +559,7 @@ def test_apply_dynamic_database_filter(
|
||||
mocker.patch("sqlalchemy.engine.URL.get_driver_name", return_value="gsheets")
|
||||
mocker.patch("superset.utils.log.DBEventLogger.log")
|
||||
mocker.patch(
|
||||
"superset.databases.ssh_tunnel.commands.delete.is_feature_enabled",
|
||||
"superset.commands.database.ssh_tunnel.delete.is_feature_enabled",
|
||||
return_value=False,
|
||||
)
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ def test_import_database(mocker: MockFixture, session: Session) -> None:
|
||||
Test importing a database.
|
||||
"""
|
||||
from superset import security_manager
|
||||
from superset.databases.commands.importers.v1.utils import import_database
|
||||
from superset.commands.database.importers.v1.utils import import_database
|
||||
from superset.models.core import Database
|
||||
from tests.integration_tests.fixtures.importexport import database_config
|
||||
|
||||
@@ -70,7 +70,7 @@ def test_import_database_sqlite_invalid(mocker: MockFixture, session: Session) -
|
||||
Test importing a database.
|
||||
"""
|
||||
from superset import app, security_manager
|
||||
from superset.databases.commands.importers.v1.utils import import_database
|
||||
from superset.commands.database.importers.v1.utils import import_database
|
||||
from superset.models.core import Database
|
||||
from tests.integration_tests.fixtures.importexport import database_config_sqlite
|
||||
|
||||
@@ -99,7 +99,7 @@ def test_import_database_managed_externally(
|
||||
Test importing a database that is managed externally.
|
||||
"""
|
||||
from superset import security_manager
|
||||
from superset.databases.commands.importers.v1.utils import import_database
|
||||
from superset.commands.database.importers.v1.utils import import_database
|
||||
from superset.models.core import Database
|
||||
from tests.integration_tests.fixtures.importexport import database_config
|
||||
|
||||
@@ -125,7 +125,7 @@ def test_import_database_without_permission(
|
||||
Test importing a database when a user doesn't have permissions to create.
|
||||
"""
|
||||
from superset import security_manager
|
||||
from superset.databases.commands.importers.v1.utils import import_database
|
||||
from superset.commands.database.importers.v1.utils import import_database
|
||||
from superset.models.core import Database
|
||||
from tests.integration_tests.fixtures.importexport import database_config
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
from parameterized import parameterized
|
||||
|
||||
from superset.databases.commands.test_connection import get_log_connection_action
|
||||
from superset.commands.database.test_connection import get_log_connection_action
|
||||
from superset.databases.ssh_tunnel.models import SSHTunnel
|
||||
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
import pytest
|
||||
from sqlalchemy.orm.session import Session
|
||||
|
||||
from superset.databases.ssh_tunnel.commands.exceptions import SSHTunnelInvalidError
|
||||
from superset.commands.database.ssh_tunnel.exceptions import SSHTunnelInvalidError
|
||||
|
||||
|
||||
def test_create_ssh_tunnel_command() -> None:
|
||||
from superset.databases.ssh_tunnel.commands.create import CreateSSHTunnelCommand
|
||||
from superset.commands.database.ssh_tunnel.create import CreateSSHTunnelCommand
|
||||
from superset.databases.ssh_tunnel.models import SSHTunnel
|
||||
from superset.models.core import Database
|
||||
|
||||
@@ -44,7 +44,7 @@ def test_create_ssh_tunnel_command() -> None:
|
||||
|
||||
|
||||
def test_create_ssh_tunnel_command_invalid_params() -> None:
|
||||
from superset.databases.ssh_tunnel.commands.create import CreateSSHTunnelCommand
|
||||
from superset.commands.database.ssh_tunnel.create import CreateSSHTunnelCommand
|
||||
from superset.databases.ssh_tunnel.models import SSHTunnel
|
||||
from superset.models.core import Database
|
||||
|
||||
|
||||
@@ -54,8 +54,8 @@ def session_with_data(session: Session) -> Iterator[Session]:
|
||||
def test_delete_ssh_tunnel_command(
|
||||
mocker: MockFixture, session_with_data: Session
|
||||
) -> None:
|
||||
from superset.commands.database.ssh_tunnel.delete import DeleteSSHTunnelCommand
|
||||
from superset.daos.database import DatabaseDAO
|
||||
from superset.databases.ssh_tunnel.commands.delete import DeleteSSHTunnelCommand
|
||||
from superset.databases.ssh_tunnel.models import SSHTunnel
|
||||
|
||||
result = DatabaseDAO.get_ssh_tunnel(1)
|
||||
@@ -64,7 +64,7 @@ def test_delete_ssh_tunnel_command(
|
||||
assert isinstance(result, SSHTunnel)
|
||||
assert 1 == result.database_id
|
||||
mocker.patch(
|
||||
"superset.databases.ssh_tunnel.commands.delete.is_feature_enabled",
|
||||
"superset.commands.database.ssh_tunnel.delete.is_feature_enabled",
|
||||
return_value=True,
|
||||
)
|
||||
DeleteSSHTunnelCommand(1).run()
|
||||
|
||||
@@ -20,7 +20,7 @@ from collections.abc import Iterator
|
||||
import pytest
|
||||
from sqlalchemy.orm.session import Session
|
||||
|
||||
from superset.databases.ssh_tunnel.commands.exceptions import SSHTunnelInvalidError
|
||||
from superset.commands.database.ssh_tunnel.exceptions import SSHTunnelInvalidError
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -50,8 +50,8 @@ def session_with_data(session: Session) -> Iterator[Session]:
|
||||
|
||||
|
||||
def test_update_shh_tunnel_command(session_with_data: Session) -> None:
|
||||
from superset.commands.database.ssh_tunnel.update import UpdateSSHTunnelCommand
|
||||
from superset.daos.database import DatabaseDAO
|
||||
from superset.databases.ssh_tunnel.commands.update import UpdateSSHTunnelCommand
|
||||
from superset.databases.ssh_tunnel.models import SSHTunnel
|
||||
|
||||
result = DatabaseDAO.get_ssh_tunnel(1)
|
||||
@@ -72,8 +72,8 @@ def test_update_shh_tunnel_command(session_with_data: Session) -> None:
|
||||
|
||||
|
||||
def test_update_shh_tunnel_invalid_params(session_with_data: Session) -> None:
|
||||
from superset.commands.database.ssh_tunnel.update import UpdateSSHTunnelCommand
|
||||
from superset.daos.database import DatabaseDAO
|
||||
from superset.databases.ssh_tunnel.commands.update import UpdateSSHTunnelCommand
|
||||
from superset.databases.ssh_tunnel.models import SSHTunnel
|
||||
|
||||
result = DatabaseDAO.get_ssh_tunnel(1)
|
||||
|
||||
Reference in New Issue
Block a user