l2pop UT: Expire cached db objects before reusing a session

Partial-Bug: #1441488
Change-Id: Ic22ae49d99b52e9f650ea0ed638842e7c91831af

diff --git a/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
index 06a9b26c608ac6bbd58a2f5bf6a5f81342cbf362..bbfe282d02ca32c2541bc34f5b8e0d53a5886109 100644 (file)
--- a/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
@@ -828,6 +828,8 @@ class TestL2PopulationRpcTestCase(test_plugin.Ml2PluginV2TestCase):
                     self.assertEqual(res['port']['binding:host_id'],
                                      L2_AGENT_2['host'])
                     self.mock_fanout.reset_mock()
+                    # NOTE(yamamoto): see bug #1441488
+                    self.adminContext.session.expire_all()
                     self.callbacks.get_device_details(
                         self.adminContext,
                         device=device1,
@@ -883,6 +885,8 @@ class TestL2PopulationRpcTestCase(test_plugin.Ml2PluginV2TestCase):
                     self.assertEqual(res['port']['binding:host_id'],
                                      L2_AGENT_4['host'])
                     self.mock_fanout.reset_mock()
+                    # NOTE(yamamoto): see bug #1441488
+                    self.adminContext.session.expire_all()
                     self.callbacks.get_device_details(
                         self.adminContext,
                         device=device1,