Fix call to ignore_not_found() in SwiftSignal
The call to ignore_not_found() in the SwiftSignal resource was missing an argument. Change-Id: Id65af72ed30e76ab3620248807ef05c31e1e8565 Closes-Bug: 1452412
This commit is contained in:
parent
65a76cecf3
commit
e23c42fdff
|
@ -251,7 +251,7 @@ class SwiftSignal(resource.Resource):
|
||||||
try:
|
try:
|
||||||
signal = self.client().get_object(self.stack.id, obj['name'])
|
signal = self.client().get_object(self.stack.id, obj['name'])
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
self.client_plugin().ignore_not_found()
|
self.client_plugin().ignore_not_found(exc)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
body = signal[1]
|
body = signal[1]
|
||||||
|
|
|
@ -851,3 +851,27 @@ class SwiftSignalTest(common.HeatTestCase):
|
||||||
self.assertEqual(('CREATE', 'COMPLETE'), st.state)
|
self.assertEqual(('CREATE', 'COMPLETE'), st.state)
|
||||||
wc = st['test_wait_condition']
|
wc = st['test_wait_condition']
|
||||||
self.assertEqual("null", wc.FnGetAtt('data'))
|
self.assertEqual("null", wc.FnGetAtt('data'))
|
||||||
|
|
||||||
|
@mock.patch.object(swift.SwiftClientPlugin, '_create')
|
||||||
|
@mock.patch.object(resource.Resource, 'physical_resource_name')
|
||||||
|
def test_swift_get_object_404(self, mock_name, mock_swift):
|
||||||
|
st = create_stack(swiftsignal_template)
|
||||||
|
handle = st['test_wait_condition_handle']
|
||||||
|
|
||||||
|
mock_swift_object = mock.Mock()
|
||||||
|
mock_swift.return_value = mock_swift_object
|
||||||
|
mock_swift_object.url = "http://fake-host.com:8080/v1/AUTH_1234"
|
||||||
|
mock_swift_object.head_account.return_value = {
|
||||||
|
'x-account-meta-temp-url-key': '123456'
|
||||||
|
}
|
||||||
|
obj_name = "%s-%s-abcdefghijkl" % (st.name, handle.name)
|
||||||
|
mock_name.return_value = obj_name
|
||||||
|
mock_swift_object.get_container.return_value = cont_index(obj_name, 2)
|
||||||
|
mock_swift_object.get_object.side_effect = (
|
||||||
|
(obj_header, ''),
|
||||||
|
swiftclient_client.ClientException(
|
||||||
|
"Object %s not found" % obj_name, http_status=404)
|
||||||
|
)
|
||||||
|
|
||||||
|
st.create()
|
||||||
|
self.assertEqual(('CREATE', 'COMPLETE'), st.state)
|
||||||
|
|
Loading…
Reference in New Issue