openstack
/
neutron
Code Issues Proposed changes

TestSanityCheck: drop test tables during cleanup 

The tests were creating tables in the memory but were not cleaning them
up, making them clash on attempt to create floatingips table.

Change-Id: If28ef4ce76cd36e7240d106b75e43d16f43e2c16
Closes-Bug: #1629347
This commit is contained in:
Ihar Hrachyshka 2016-09-29 20:11:07 +00:00
parent 727c79f9f6
commit 438d4a83b0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/functional/db/test_migrations.py
View File

@ -356,6 +356,10 @@ class TestSanityCheck(testlib_api.SqlTestCaseLight):
self.alembic_config = migration.get_neutron_config()
self.alembic_config.neutron_config = cfg.CONF
def _drop_table(self, table):
with self.engine.begin() as conn:
table.drop(conn)
def test_check_sanity_1df244e556f5(self):
ha_router_agent_port_bindings = sqlalchemy.Table(
'ha_router_agent_port_bindings', sqlalchemy.MetaData(),
@ -365,6 +369,7 @@ class TestSanityCheck(testlib_api.SqlTestCaseLight):
with self.engine.connect() as conn:
ha_router_agent_port_bindings.create(conn)
self.addCleanup(self._drop_table, ha_router_agent_port_bindings)
conn.execute(ha_router_agent_port_bindings.insert(), [
{'port_id': '1234', 'router_id': '12345',
'l3_agent_id': '123'},
@ -386,6 +391,7 @@ class TestSanityCheck(testlib_api.SqlTestCaseLight):
with self.engine.connect() as conn:
routerports.create(conn)
self.addCleanup(self._drop_table, routerports)
conn.execute(routerports.insert(), [
{'router_id': '1234', 'port_id': '12345',
'port_type': '123'},
@ -407,6 +413,7 @@ class TestSanityCheck(testlib_api.SqlTestCaseLight):
with self.engine.connect() as conn:
floatingips.create(conn)
self.addCleanup(self._drop_table, floatingips)
conn.execute(floatingips.insert(), [
{'floating_network_id': '12345',
'fixed_port_id': '1234567',
@ -430,6 +437,7 @@ class TestSanityCheck(testlib_api.SqlTestCaseLight):
with self.engine.connect() as conn:
floatingips.create(conn)
self.addCleanup(self._drop_table, floatingips)
conn.execute(floatingips.insert(), [
{'floating_network_id': '12345',
'fixed_port_id': '1234567',