Merge "Integrate Rally & Alembic"

This commit is contained in:
Jenkins 2016-02-01 12:24:53 +00:00 committed by Gerrit Code Review
commit 110f013833
4 changed files with 6 additions and 3 deletions

View File

@ -5,3 +5,4 @@ source = rally
[report] [report]
ignore_errors = True ignore_errors = True
precision = 3 precision = 3
omit = */migrations/versions/ca3626f62937_init_migration.py

View File

@ -33,6 +33,7 @@ Contents
user_stories user_stories
plugins plugins
plugin/plugin_reference plugin/plugin_reference
db_migrations
contribute contribute
gates gates
feature_requests feature_requests

View File

@ -1,6 +1,7 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
alembic>=0.8.0 # MIT
Babel>=1.3 # BSD Babel>=1.3 # BSD
boto>=2.32.1 # MIT boto>=2.32.1 # MIT
decorator>=3.4.0 # BSD decorator>=3.4.0 # BSD

View File

@ -31,10 +31,10 @@ class DatabaseFixture(fixture.Config):
def setUp(self): def setUp(self):
super(DatabaseFixture, self).setUp() super(DatabaseFixture, self).setUp()
db_url = os.environ.get("RALLY_UNITTEST_DB_URL", "sqlite://") db_url = os.environ.get("RALLY_UNITTEST_DB_URL", "sqlite://")
db.db_cleanup() db.engine_reset()
self.conf.set_default("connection", db_url, group="database") self.conf.set_default("connection", db_url, group="database")
db.db_drop() db.schema_cleanup()
db.db_create() db.schema_create()
class TestCase(base.BaseTestCase): class TestCase(base.BaseTestCase):