Make _succeed function return a callable

Author: ryansb

cfn_resource.py

@@ -77,15 +77,18 @@ def __init__(self, wrapper=wrap_user_handler):
     def __call__(self, event, context):
         request = event['RequestType']
         logger.debug("Received {} type event. Full parameters: {}".format(request, json.dumps(event)))
-        return self._dispatch.get(request, self._succeed)(event, context)
-
-    def _succeed(self, event, context):
-        return {
-            'Status': SUCCESS,
-            'PhysicalResourceId': event.get('PhysicalResourceId', 'mock-resource-id'),
-            'Reason': 'Life is good, man',
-            'Data': {},
-        }
+        return self._dispatch.get(request, self._succeed())(event, context)
+
+    def _succeed(self):
+        @self._wrapper
+        def success(event, context):
+            return {
+                'Status': SUCCESS,
+                'PhysicalResourceId': event.get('PhysicalResourceId', 'mock-resource-id'),
+                'Reason': 'Life is good, man',
+                'Data': {},
+            }
+        return success
 
     def create(self, wraps):
         self._dispatch['Create'] = self._wrapper(wraps)

test_cfn_resource.py

@@ -71,12 +71,23 @@ def flaky_function(*args):
     args = urlmock.call_args
     sent_req = args[0][0]
 
-    assert sent_req.get_method() == 'PUT'
     reply = json.loads(sent_req.data)
+
     assert reply['Status'] == cfn_resource.FAILED
     assert reply['StackId'] == base_event['StackId']
     assert reply['Reason'] == "Exception was raised while handling custom resource"
 
+@mock.patch('urllib2.urlopen')
+def test_sends_put_request(urlmock):
+    rsrc = cfn_resource.Resource()
+
+    resp = rsrc(base_event.copy(), FakeLambdaContext())
+
+    args = urlmock.call_args
+    sent_req = args[0][0]
+
+    assert sent_req.get_method() == 'PUT'
+
 ### Tests for the Resource object and its decorator for wrapping
 ### user handlers