From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 16 Dec 2014 22:11:50 +0000 (+0000)
Subject: Merge "Remove commented out code from cinder/test.py"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dce4c530614de77ee19dbbe6d58380fb1b2907ef;p=openstack-build%2Fcinder-build.git

Merge "Remove commented out code from cinder/test.py"
---

dce4c530614de77ee19dbbe6d58380fb1b2907ef
diff --cc cinder/test.py
index 38896cbf9,19c38e922..209b1dfa9
--- a/cinder/test.py
+++ b/cinder/test.py
@@@ -76,8 -76,14 +76,7 @@@ class Database(fixtures.Fixture)
          self.engine = db_api.get_engine()
          self.engine.dispose()
          conn = self.engine.connect()
 -        if sql_connection == "sqlite://":
 -            if db_migrate.db_version() > db_migrate.db_initial_version():
 -                return
 -        else:
 -            testdb = os.path.join(CONF.state_path, sqlite_db)
 -            if os.path.exists(testdb):
 -                return
          db_migrate.db_sync()
- #        self.post_migrations()
          if sql_connection == "sqlite://":
              conn = self.engine.connect()
              self._DB = "".join(line for line in conn.connection.iterdump())