Merge pull request #579 from ttung/tonytung-timeout

Scale the lambda_timeout parameter correctly.
aws · Nov 16, 2017 · 3503c2e · 3503c2e
2 parents 3caf032 + 934a6ca
commit 3503c2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/chalice/local.py b/chalice/local.py
@@ -402,10 +402,14 @@ def __init__(self, app_object, config):
 
     def _generate_lambda_context(self):
         # type: () -> LambdaContext
+        if self._config.lambda_timeout is None:
+            timeout = None
+        else:
+            timeout = self._config.lambda_timeout * 1000
         return LambdaContext(
             function_name=self._config.function_name,
             memory_size=self._config.lambda_memory_size,
-            max_runtime_ms=self._config.lambda_timeout
+            max_runtime_ms=timeout
         )
 
     def _generate_lambda_event(self, method, path, headers, body):

diff --git a/tests/unit/test_local.py b/tests/unit/test_local.py
@@ -677,7 +677,8 @@ def context_view():
         assert body['name'] == 'api_handler'
         assert body['memory'] == 256
         assert body['version'] == '$LATEST'
-        assert body['timeout'] <= 10
+        assert body['timeout'] > 10
+        assert body['timeout'] <= 10000
         assert AWS_REQUEST_ID_PATTERN.match(body['request_id'])
 
     def test_can_validate_route_with_variables(self, demo_app_auth):