Merge "let addCleanup use the current client"

This commit is contained in:
Jenkins 2017-02-04 03:33:48 +00:00 committed by Gerrit Code Review
commit f2d72d8f6d

View File

@ -728,7 +728,7 @@ class NetworkScenarioTest(ScenarioTest):
self.assertEqual(network['name'], name)
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.networks_client.delete_network,
networks_client.delete_network,
network['id'])
return network
@ -881,7 +881,7 @@ class NetworkScenarioTest(ScenarioTest):
)
floating_ip = result['floatingip']
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.floating_ips_client.delete_floatingip,
client.delete_floatingip,
floating_ip['id'])
return floating_ip