]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "Remove commented out code from cinder/test.py"
authorJenkins <jenkins@review.openstack.org>
Tue, 16 Dec 2014 22:11:50 +0000 (22:11 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 Dec 2014 22:11:50 +0000 (22:11 +0000)
1  2 
cinder/test.py

diff --cc cinder/test.py
index 38896cbf9683e7bcd796267ff78444c6380d6890,19c38e922a087b696b3650d20ec37285f94895e3..209b1dfa9016d1a6c2a9d1a05393a82a93de75df
@@@ -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())