From 39e9379195816cf993621306ff37aeca7dc46b8a Mon Sep 17 00:00:00 2001 From: Toshiya Kawasaki Date: Thu, 22 Mar 2018 00:55:03 +0900 Subject: [PATCH] Fix cloudwatch logs' response error (#1426) --- moto/logs/responses.py | 3 +-- tests/test_logs/test_logs.py | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/moto/logs/responses.py b/moto/logs/responses.py index e0a17f5f8..7bf481908 100644 --- a/moto/logs/responses.py +++ b/moto/logs/responses.py @@ -87,9 +87,8 @@ class LogsResponse(BaseResponse): events, next_backward_token, next_foward_token = \ self.logs_backend.get_log_events(log_group_name, log_stream_name, start_time, end_time, limit, next_token, start_from_head) - return json.dumps({ - "events": [ob.__dict__ for ob in events], + "events": events, "nextBackwardToken": next_backward_token, "nextForwardToken": next_foward_token }) diff --git a/tests/test_logs/test_logs.py b/tests/test_logs/test_logs.py index 1b2f5f75e..0139723c9 100644 --- a/tests/test_logs/test_logs.py +++ b/tests/test_logs/test_logs.py @@ -59,3 +59,30 @@ def test_exceptions(): }, ], ) + + +@mock_logs +def test_put_logs(): + conn = boto3.client('logs', 'us-west-2') + log_group_name = 'dummy' + log_stream_name = 'stream' + conn.create_log_group(logGroupName=log_group_name) + conn.create_log_stream( + logGroupName=log_group_name, + logStreamName=log_stream_name + ) + messages = [ + {'timestamp': 0, 'message': 'hello'}, + {'timestamp': 0, 'message': 'world'} + ] + conn.put_log_events( + logGroupName=log_group_name, + logStreamName=log_stream_name, + logEvents=messages + ) + res = conn.get_log_events( + logGroupName=log_group_name, + logStreamName=log_stream_name + ) + events = res['events'] + events.should.have.length_of(2) \ No newline at end of file