Merge "storage: fix mongo live tests"

tests/storage/base.py

@@ -61,11 +61,6 @@ class DBEngineBase(object):
 class DBTestBase(test_base.TestCase):
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, *args):
-        super(DBTestBase, self).__init__(*args)
-        self.engine = None
-        self.conn = None
-
     @classmethod
     @abc.abstractmethod
     def get_engine(cls):
@@ -73,11 +68,6 @@ class DBTestBase(test_base.TestCase):
            the DBEngineTestBase abstract class
         '''
 
-    def __setup_engine(self):
-        if self.engine is None:
-            self.engine = self.get_engine()
-            self.conn = self.engine.get_connection()
-
     def tearDown(self):
         self.engine.clean_up()
         self.conn = None
@@ -86,11 +76,11 @@ class DBTestBase(test_base.TestCase):
 
     def setUp(self):
         super(DBTestBase, self).setUp()
-        self.__setup_engine()
+        self.engine = self.get_engine()
+        self.conn = self.engine.get_connection()
         self.prepare_data()
 
     def prepare_data(self):
-        #prepare the test data
         self.msgs = []
         self.counter = counter.Counter(
             'instance',

tests/storage/test_impl_mongodb.py

@@ -56,11 +56,14 @@ class MongoDBEngine(base.DBEngineBase):
 
     DBNAME = 'testdb'
 
+    def tearDown(self):
+        self.conn.drop_database(self.DBNAME)
+        super(MongoDBEngine, self).tearDown()
+
     def get_connection(self):
         conf = mox.Mox().CreateMockAnything()
         conf.database_connection = 'mongodb://localhost/%s' % self.DBNAME
         self.conn = TestConnection(conf)
-        self.conn.drop_database(self.DBNAME)
         self.db = self.conn.conn[self.DBNAME]
         return self.conn