Merge "The BZ1542122 is fixed and now the test shouldn't be skipped"
This commit is contained in:
commit
6ad3311874
@ -60,7 +60,7 @@ find_l3_agent_hosting_router = _client.find_l3_agent_hosting_router
|
|||||||
list_dhcp_agent_hosting_network = _client.list_dhcp_agent_hosting_network
|
list_dhcp_agent_hosting_network = _client.list_dhcp_agent_hosting_network
|
||||||
|
|
||||||
NoSuchPort = _client.NoSuchPort
|
NoSuchPort = _client.NoSuchPort
|
||||||
NoSuchFIP = _client.NoSuchPort
|
NoSuchFIP = _client.NoSuchFIP
|
||||||
NoSuchRouter = _client.NoSuchRouter
|
NoSuchRouter = _client.NoSuchRouter
|
||||||
NoSuchSubnet = _client.NoSuchSubnet
|
NoSuchSubnet = _client.NoSuchSubnet
|
||||||
|
|
||||||
|
@ -243,7 +243,7 @@ class FloatingIpWithL3HATest(FloatingIPTest):
|
|||||||
stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
|
stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
|
||||||
|
|
||||||
|
|
||||||
@topology.skip_unless_osp_version('16.1', higher=True)
|
@topology.skip_unless_osp_version('16.1')
|
||||||
class TestFloatingIPLogging(testtools.TestCase):
|
class TestFloatingIPLogging(testtools.TestCase):
|
||||||
|
|
||||||
stack = tobiko.required_setup_fixture(stacks.NetworkStackFixture)
|
stack = tobiko.required_setup_fixture(stacks.NetworkStackFixture)
|
||||||
@ -297,7 +297,6 @@ class TestFloatingIPLogging(testtools.TestCase):
|
|||||||
self.assertIn(self.port['id'], new_logs[0][1])
|
self.assertIn(self.port['id'], new_logs[0][1])
|
||||||
self.assertIn(self.fip['floating_ip_address'], new_logs[0][1])
|
self.assertIn(self.fip['floating_ip_address'], new_logs[0][1])
|
||||||
|
|
||||||
@tobiko.skip('Skipped because of bz1542122')
|
|
||||||
def test_fip_delete_detach_log(self):
|
def test_fip_delete_detach_log(self):
|
||||||
'''Test log that FIP is dettached from VM if FIP is deleted'''
|
'''Test log that FIP is dettached from VM if FIP is deleted'''
|
||||||
neutron.update_floating_ip(
|
neutron.update_floating_ip(
|
||||||
|
Loading…
Reference in New Issue
Block a user