openstack/tuning-box
Code Issues Proposed changes

Move migration dir determination to common module

Browse Source 
Also use it instead of __file__ magic in nailgun module.

Change-Id: Ie60f817158c1b70d433f4ee2f4218f98f1982dbe
This commit is contained in:
Yuriy Taraday 2016-04-26 10:53:03 +03:00
parent fe441d1862
commit d66ed0922d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tuning_box/__init__.py
View File

@ -13,7 +13,12 @@
# under the License. # under the License.
import pbr.version import pbr.version
import pkg_resources
__version__ = pbr.version.VersionInfo( __version__ = pbr.version.VersionInfo(
'tuning_box').version_string() 'tuning_box').version_string()
def get_migrations_dir():
return pkg_resources.resource_filename('tuning_box', 'migrations')

3
tuning_box/nailgun.py
View File

@ -13,7 +13,6 @@
from __future__ import absolute_import from __future__ import absolute_import
import itertools import itertools
import os
import threading import threading
from nailgun import db as nailgun_db from nailgun import db as nailgun_db
@ -84,4 +83,4 @@ class Extension(extensions.BaseExtension):
@classmethod @classmethod
def alembic_migrations_path(cls): def alembic_migrations_path(cls):
return os.path.join(os.path.dirname(__file__), 'migrations') return tuning_box.get_migrations_dir()

8
tuning_box/tests/test_db.py
View File

@ -22,11 +22,11 @@ from alembic import script as alembic_script
import flask import flask
from oslo_db.sqlalchemy import test_base from oslo_db.sqlalchemy import test_base
from oslo_db.sqlalchemy import test_migrations from oslo_db.sqlalchemy import test_migrations
import pkg_resources
import sqlalchemy as sa import sqlalchemy as sa
import testscenarios import testscenarios
from werkzeug import exceptions from werkzeug import exceptions
import tuning_box
from tuning_box import db from tuning_box import db
from tuning_box.tests import base from tuning_box.tests import base
@ -152,13 +152,11 @@ class _RealDBTest(testscenarios.WithScenarios,
('postgres', {'FIXTURE': test_base.PostgreSQLOpportunisticFixture}), ('postgres', {'FIXTURE': test_base.PostgreSQLOpportunisticFixture}),
] ]
def get_migrations_dir(self):
return pkg_resources.resource_filename('tuning_box', 'migrations')
def get_alembic_config(self, engine): def get_alembic_config(self, engine):
config = alembic_config.Config() config = alembic_config.Config()
config.set_main_option('sqlalchemy.url', str(engine.url)) config.set_main_option('sqlalchemy.url', str(engine.url))
config.set_main_option('script_location', self.get_migrations_dir()) config.set_main_option(
'script_location', tuning_box.get_migrations_dir())
config.set_main_option('version_table', 'alembic_version') config.set_main_option('version_table', 'alembic_version')
return config return config