openstack/deb-heat
Code Issues Proposed changes

Merge "Set statuscode=404 in NotFoundException in tests"

Browse Source
This commit is contained in:
Jenkins 2014-03-18 07:37:30 +00:00 committed by Gerrit Code Review
commit 99d1483b19
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/tests/test_neutron.py
View File

@ -397,7 +397,7 @@ class NeutronNetTest(HeatTestCase):
neutronclient.Client.show_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.NetworkNotFoundClient())
).AndRaise(qe.NetworkNotFoundClient(status_code=404))
neutronclient.Client.show_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
@ -439,11 +439,11 @@ class NeutronNetTest(HeatTestCase):
neutronclient.Client.show_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.NetworkNotFoundClient())
).AndRaise(qe.NetworkNotFoundClient(status_code=404))
neutronclient.Client.delete_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.NetworkNotFoundClient())
).AndRaise(qe.NetworkNotFoundClient(status_code=404))
self.m.ReplayAll()
t = template_format.parse(neutron_template)
@ -647,7 +647,7 @@ class NeutronProviderNetTest(HeatTestCase):
neutronclient.Client.show_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.NetworkNotFoundClient())
).AndRaise(qe.NetworkNotFoundClient(status_code=404))
# Delete script
neutronclient.Client.delete_network(
@ -660,11 +660,11 @@ class NeutronProviderNetTest(HeatTestCase):
neutronclient.Client.show_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.NetworkNotFoundClient())
).AndRaise(qe.NetworkNotFoundClient(status_code=404))
neutronclient.Client.delete_network(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.NetworkNotFoundClient())
).AndRaise(qe.NetworkNotFoundClient(status_code=404))
self.m.ReplayAll()
@ -1628,7 +1628,7 @@ class NeutronFloatingIPTest(HeatTestCase):
}})
neutronclient.Client.show_port(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.PortNotFoundClient())
).AndRaise(qe.PortNotFoundClient(status_code=404))
neutronclient.Client.show_port(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).MultipleTimes().AndReturn({'port': {
@ -1739,7 +1739,7 @@ class NeutronFloatingIPTest(HeatTestCase):
neutronclient.Client.show_port(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.PortNotFoundClient())
).AndRaise(qe.PortNotFoundClient(status_code=404))
neutronclient.Client.delete_floatingip(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
@ -1753,7 +1753,7 @@ class NeutronFloatingIPTest(HeatTestCase):
neutronclient.Client.delete_port(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndRaise(qe.PortNotFoundClient())
).AndRaise(qe.PortNotFoundClient(status_code=404))
neutronclient.Client.delete_floatingip(
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'