Skip to content

Commit

Permalink
instrumentation/botocore: fix failing test (#1100)
Browse files Browse the repository at this point in the history
The failing test was introduced I believe by a change in behaviour noted in this issue: getmoto/moto#3292. The solution is to set a region in the create_bucket call.

Fixes #1088
  • Loading branch information
alrex authored and codeboten committed Oct 22, 2020
1 parent 5cdb626 commit 9cee1c5
Showing 1 changed file with 30 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,35 +104,36 @@ def test_s3_client(self):
)

# Comment test for issue 1088
# @mock_s3
# def test_s3_put(self):
# params = dict(Key="foo", Bucket="mybucket", Body=b"bar")
# s3 = self.session.create_client("s3", region_name="us-west-2")
# s3.create_bucket(Bucket="mybucket")
# s3.put_object(**params)

# spans = self.memory_exporter.get_finished_spans()
# assert spans
# span = spans[0]
# self.assertEqual(len(spans), 2)
# self.assertEqual(span.attributes["aws.operation"], "CreateBucket")
# assert_span_http_status_code(span, 200)
# self.assertEqual(
# span.resource,
# Resource(
# attributes={"endpoint": "s3", "operation": "createbucket"}
# ),
# )
# self.assertEqual(spans[1].attributes["aws.operation"], "PutObject")
# self.assertEqual(
# spans[1].resource,
# Resource(attributes={"endpoint": "s3", "operation": "putobject"}),
# )
# self.assertEqual(spans[1].attributes["params.Key"], str(params["Key"]))
# self.assertEqual(
# spans[1].attributes["params.Bucket"], str(params["Bucket"])
# )
# self.assertTrue("params.Body" not in spans[1].attributes.keys())
@mock_s3
def test_s3_put(self):
params = dict(Key="foo", Bucket="mybucket", Body=b"bar")
s3 = self.session.create_client("s3", region_name="us-west-2")
location = {"LocationConstraint": "us-west-2"}
s3.create_bucket(Bucket="mybucket", CreateBucketConfiguration=location)
s3.put_object(**params)

spans = self.memory_exporter.get_finished_spans()
assert spans
span = spans[0]
self.assertEqual(len(spans), 2)
self.assertEqual(span.attributes["aws.operation"], "CreateBucket")
assert_span_http_status_code(span, 200)
self.assertEqual(
span.resource,
Resource(
attributes={"endpoint": "s3", "operation": "createbucket"}
),
)
self.assertEqual(spans[1].attributes["aws.operation"], "PutObject")
self.assertEqual(
spans[1].resource,
Resource(attributes={"endpoint": "s3", "operation": "putobject"}),
)
self.assertEqual(spans[1].attributes["params.Key"], str(params["Key"]))
self.assertEqual(
spans[1].attributes["params.Bucket"], str(params["Bucket"])
)
self.assertTrue("params.Body" not in spans[1].attributes.keys())

@mock_sqs
def test_sqs_client(self):
Expand Down

0 comments on commit 9cee1c5

Please sign in to comment.