Merge "Revert connection option post full-stack tests"

neutron/tests/fullstack/base.py

@@ -56,5 +56,14 @@ class BaseFullStackTestCase(test_base.MySQLOpportunisticTestCase):
             'username': test_base.DbFixture.USERNAME,
             'password': test_base.DbFixture.PASSWORD,
             'db_name': self.engine.url.database}
+
+        self.original_conn = cfg.CONF.database.connection
+        self.addCleanup(self._revert_connection_address)
         cfg.CONF.set_override('connection', conn, group='database')
+
         model_base.BASEV2.metadata.create_all(self.engine)
+
+    def _revert_connection_address(self):
+        cfg.CONF.set_override('connection',
+                              self.original_conn,
+                              group='database')

neutron/tests/retargetable/base.py

@@ -77,7 +77,4 @@ class RetargetableApiTest(testscenarios.WithScenarios,
         if rest_enabled():
             raise self.skipException(
                 'Tempest fixture requirements prevent this test from running')
-        else:
-            raise self.skipException(
-                "Fullstack's db fixture usage prevents this test from running")
         self.useFixture(self.client)