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

Moving get_main_db out of tests and into superset utils (#5864)

Browse Source
This commit is contained in:
michellethomas
2018-09-11 22:50:14 -07:00
committed by John Bodley
parent c82cea3c8d
commit 657993d609
9 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/base_tests.py
View File

@@ -18,7 +18,7 @@ from superset import app, cli, db, security_manager
from superset.connectors.druid.models import DruidCluster, DruidDatasource
from superset.connectors.sqla.models import SqlaTable
from superset.models import core as models
from .utils import get_main_database
from superset.utils import get_main_database
BASE_DIR = app.config.get('BASE_DIR')

2
tests/celery_tests.py
View File

@@ -18,8 +18,8 @@ from superset import app, cli, db, security_manager
from superset.models.helpers import QueryStatus
from superset.models.sql_lab import Query
from superset.sql_parse import SupersetQuery
from superset.utils import get_main_database
from .base_tests import SupersetTestCase
from .utils import get_main_database
BASE_DIR = app.config.get('BASE_DIR')

2
tests/core_tests.py
View File

@@ -27,9 +27,9 @@ from superset.connectors.sqla.models import SqlaTable
from superset.db_engine_specs import BaseEngineSpec
from superset.models import core as models
from superset.models.sql_lab import Query
from superset.utils import get_main_database
from superset.views.core import DatabaseView
from .base_tests import SupersetTestCase
from .utils import get_main_database
class CoreTests(SupersetTestCase):

2
tests/dict_import_export_tests.py
View File

@@ -15,8 +15,8 @@ from superset.connectors.druid.models import (
DruidColumn, DruidDatasource, DruidMetric,
)
from superset.connectors.sqla.models import SqlaTable, SqlMetric, TableColumn
from superset.utils import get_main_database
from .base_tests import SupersetTestCase
from .utils import get_main_database
DBREF = 'dict_import__export_test'
NAME_PREFIX = 'dict_'

2
tests/model_tests.py
View File

@@ -10,8 +10,8 @@ from sqlalchemy.engine.url import make_url
from superset import app, db
from superset.models.core import Database
from superset.utils import get_main_database
from .base_tests import SupersetTestCase
from .utils import get_main_database
class DatabaseModelTestCase(SupersetTestCase):

2
tests/sqllab_tests.py
View File

@@ -15,8 +15,8 @@ from superset import db, security_manager, utils
from superset.dataframe import SupersetDataFrame
from superset.db_engine_specs import BaseEngineSpec
from superset.models.sql_lab import Query
from superset.utils import get_main_database
from .base_tests import SupersetTestCase
from .utils import get_main_database
class SqlLabTests(SupersetTestCase):

11
tests/utils.py
View File

@@ -7,20 +7,9 @@ from __future__ import unicode_literals
import json
from os import path
from superset import db
from superset.models import core as models
FIXTURES_DIR = 'tests/fixtures'
def load_fixture(fixture_file_name):
with open(path.join(FIXTURES_DIR, fixture_file_name)) as fixture_file:
return json.load(fixture_file)
def get_main_database(session):
return (
db.session.query(models.Database)
.filter_by(database_name='main')
.first()
)