summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-22 18:45:50 +0000
committerGerrit Code Review <review@openstack.org>2013-02-22 18:45:50 +0000
commit9dfd9a2ba77812010c3aa2fa400e151488901022 (patch)
tree1660f7a0b7ba1d3531a420e8c86a706ac7a5fff0
parent6a9da777e9759d49a555e95f6dd9728d5077f05a (diff)
parent0356446d752bc5c5d408766951ccf22bec4af9fb (diff)
downloadnova-9dfd9a2ba77812010c3aa2fa400e151488901022.tar.gz
nova-9dfd9a2ba77812010c3aa2fa400e151488901022.tar.xz
nova-9dfd9a2ba77812010c3aa2fa400e151488901022.zip
Merge "Fix migration snake-walk."
-rw-r--r--nova/tests/test_migrations.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py
index 2e5a01a6a..3cb2df41f 100644
--- a/nova/tests/test_migrations.py
+++ b/nova/tests/test_migrations.py
@@ -374,7 +374,7 @@ class BaseMigrationTestCase(test.TestCase):
# upgrade -> downgrade -> upgrade
self._migrate_up(engine, version, with_data=True)
if snake_walk:
- self._migrate_down(engine, version)
+ self._migrate_down(engine, version - 1)
self._migrate_up(engine, version)
if downgrade:
@@ -384,10 +384,10 @@ class BaseMigrationTestCase(test.TestCase):
xrange(self.INIT_VERSION + 2,
self.REPOSITORY.latest + 1)):
# downgrade -> upgrade -> downgrade
- self._migrate_down(engine, version)
+ self._migrate_down(engine, version - 1)
if snake_walk:
self._migrate_up(engine, version)
- self._migrate_down(engine, version)
+ self._migrate_down(engine, version - 1)
def _migrate_down(self, engine, version):
self.migration_api.downgrade(engine,