Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the Lambda invocation due to lambci changes.

Browse Source 
It looks like lambci is pre-pending the "lambda" responses with an
escape character `\033`. This was breaking the unit tests.
This commit is contained in:
Mike Grima 2019-11-17 17:15:01 -08:00
parent dab7f9fdad
commit 27f36a7514
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/awslambda/models.py
View File

@ -46,8 +46,9 @@ try:
except ImportError: except ImportError:
from backports.tempfile import TemporaryDirectory from backports.tempfile import TemporaryDirectory
# The lambci container is returning a special escape character for the "RequestID" fields. Unicode 033:
_stderr_regex = re.compile(r"START|END|REPORT RequestId: .*") # _stderr_regex = re.compile(r"START|END|REPORT RequestId: .*")
_stderr_regex = re.compile(r"\033\[\d+.*")
_orig_adapter_send = requests.adapters.HTTPAdapter.send _orig_adapter_send = requests.adapters.HTTPAdapter.send
docker_3 = docker.__version__[0] >= "3" docker_3 = docker.__version__[0] >= "3"
@ -444,7 +445,7 @@ class LambdaFunction(BaseModel):
if exit_code != 0: if exit_code != 0:
raise Exception("lambda invoke failed output: {}".format(output)) raise Exception("lambda invoke failed output: {}".format(output))
# strip out RequestId lines # strip out RequestId lines (TODO: This will return an additional '\n' in the response)
output = os.linesep.join( output = os.linesep.join(
[ [
line line

10
tests/test_awslambda/test_lambda.py
View File

@ -162,7 +162,7 @@ if settings.TEST_SERVER_MODE:
conn = boto3.client("lambda", "us-west-2") conn = boto3.client("lambda", "us-west-2")
conn.create_function( conn.create_function(
FunctionName="testFunction", FunctionName="testFunction",
Runtime="python2.7", Runtime="python3.7",
Role="test-iam-role", Role="test-iam-role",
Handler="lambda_function.lambda_handler", Handler="lambda_function.lambda_handler",
Code={"ZipFile": get_test_zip_file2()}, Code={"ZipFile": get_test_zip_file2()},
@ -184,18 +184,20 @@ if settings.TEST_SERVER_MODE:
vol.id, vol.id,
vol.state, vol.state,
vol.size, vol.size,
json.dumps(in_data), json.dumps(in_data).replace(
" ", ""
), # Makes the tests pass as the result is missing the whitespace
) )
log_result = base64.b64decode(result["LogResult"]).decode("utf-8") log_result = base64.b64decode(result["LogResult"]).decode("utf-8")
# fix for running under travis (TODO: investigate why it has an extra newline) # The Docker lambda invocation will return an additional '\n', so need to replace it:
log_result = log_result.replace("\n\n", "\n") log_result = log_result.replace("\n\n", "\n")
log_result.should.equal(msg) log_result.should.equal(msg)
payload = result["Payload"].read().decode("utf-8") payload = result["Payload"].read().decode("utf-8")
# fix for running under travis (TODO: investigate why it has an extra newline) # The Docker lambda invocation will return an additional '\n', so need to replace it:
payload = payload.replace("\n\n", "\n") payload = payload.replace("\n\n", "\n")
payload.should.equal(msg) payload.should.equal(msg)