Merge branch 'master' into feature/2546
This commit is contained in:
commit
0ea98f22ee
44 changed files with 2383 additions and 218 deletions
|
|
@ -164,7 +164,7 @@ if settings.TEST_SERVER_MODE:
|
|||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
Runtime="python2.7",
|
||||
Runtime="python3.7",
|
||||
Role=get_role_name(),
|
||||
Handler="lambda_function.lambda_handler",
|
||||
Code={"ZipFile": get_test_zip_file2()},
|
||||
|
|
@ -186,18 +186,20 @@ if settings.TEST_SERVER_MODE:
|
|||
vol.id,
|
||||
vol.state,
|
||||
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")
|
||||
|
||||
# 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.should.equal(msg)
|
||||
|
||||
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.should.equal(msg)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue