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

Techdebt: Replace sure with regular assertions in Xray (#6656)

Browse Source
This commit is contained in:
kbalk 2023-08-14 05:53:44 -04:00 committed by GitHub
parent 3c4f4b5b0a
commit 795e9b8677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_xray/test_xray_boto3.py
View File

@ -1,11 +1,9 @@
import boto3 import datetime
import json import json
import sure # noqa # pylint: disable=unused-import import boto3
from moto import mock_xray from moto import mock_xray
import datetime
@mock_xray @mock_xray
def test_put_telemetry(): def test_put_telemetry():
@ -119,8 +117,8 @@ def test_batch_get_trace():
"1-581cf772-b006649127e371903a2de979", "1-581cf772-b006649127e371903a2de979",
] ]
) )
len(resp["UnprocessedTraceIds"]).should.equal(1) assert len(resp["UnprocessedTraceIds"]) == 1
len(resp["Traces"]).should.equal(1) assert len(resp["Traces"]) == 1
# Following are not implemented, just testing it returns what boto expects # Following are not implemented, just testing it returns what boto expects

30
tests/test_xray/test_xray_client.py
View File

@ -1,23 +1,21 @@
import os import os
import requests # noqa # pylint: disable=all
import sys
from unittest import SkipTest
import aws_xray_sdk.core as xray_core
import aws_xray_sdk.core.patcher as xray_core_patcher
import boto3
import botocore.client
import botocore.endpoint
from moto import mock_xray_client, XRaySegment, mock_dynamodb from moto import mock_xray_client, XRaySegment, mock_dynamodb
from moto.utilities.distutils_version import LooseVersion from moto.utilities.distutils_version import LooseVersion
from unittest import SkipTest
import sure # noqa # pylint: disable=unused-import
import boto3
import sys
from moto.xray.mock_client import MockEmitter from moto.xray.mock_client import MockEmitter
import aws_xray_sdk.core as xray_core
import aws_xray_sdk.core.patcher as xray_core_patcher
import botocore.client
import botocore.endpoint
original_make_api_call = botocore.client.BaseClient._make_api_call original_make_api_call = botocore.client.BaseClient._make_api_call
original_encode_headers = botocore.endpoint.Endpoint._encode_headers original_encode_headers = botocore.endpoint.Endpoint._encode_headers
import requests # noqa # pylint: disable=all
original_session_request = requests.Session.request original_session_request = requests.Session.request
original_session_prep_request = requests.Session.prepare_request original_session_prep_request = requests.Session.prepare_request
@ -52,7 +50,7 @@ def test_xray_dynamo_request_id():
with XRaySegment(): with XRaySegment():
resp = client.list_tables() resp = client.list_tables()
resp["ResponseMetadata"].should.contain("RequestId") assert "RequestId" in resp["ResponseMetadata"]
id1 = resp["ResponseMetadata"]["RequestId"] id1 = resp["ResponseMetadata"]["RequestId"]
with XRaySegment(): with XRaySegment():
@ -60,7 +58,7 @@ def test_xray_dynamo_request_id():
resp = client.list_tables() resp = client.list_tables()
id2 = resp["ResponseMetadata"]["RequestId"] id2 = resp["ResponseMetadata"]["RequestId"]
id1.should_not.equal(id2) assert id1 != id2
setattr(botocore.client.BaseClient, "_make_api_call", original_make_api_call) setattr(botocore.client.BaseClient, "_make_api_call", original_make_api_call)
setattr(botocore.endpoint.Endpoint, "_encode_headers", original_encode_headers) setattr(botocore.endpoint.Endpoint, "_encode_headers", original_encode_headers)
@ -82,7 +80,7 @@ def test_xray_dynamo_request_id_with_context_mgr():
with XRaySegment(): with XRaySegment():
resp = client.list_tables() resp = client.list_tables()
resp["ResponseMetadata"].should.contain("RequestId") assert "RequestId" in resp["ResponseMetadata"]
id1 = resp["ResponseMetadata"]["RequestId"] id1 = resp["ResponseMetadata"]["RequestId"]
with XRaySegment(): with XRaySegment():
@ -90,7 +88,7 @@ def test_xray_dynamo_request_id_with_context_mgr():
resp = client.list_tables() resp = client.list_tables()
id2 = resp["ResponseMetadata"]["RequestId"] id2 = resp["ResponseMetadata"]["RequestId"]
id1.should_not.equal(id2) assert id1 != id2
setattr( setattr(
botocore.client.BaseClient, "_make_api_call", original_make_api_call botocore.client.BaseClient, "_make_api_call", original_make_api_call
@ -129,7 +127,7 @@ def test_xray_context_patched():
xray_core_patcher._PATCHED_MODULES = set() xray_core_patcher._PATCHED_MODULES = set()
xray_core.patch_all() xray_core.patch_all()
xray_core.xray_recorder._context.context_missing.should.equal("LOG_ERROR") assert xray_core.xray_recorder._context.context_missing == "LOG_ERROR"
setattr(botocore.client.BaseClient, "_make_api_call", original_make_api_call) setattr(botocore.client.BaseClient, "_make_api_call", original_make_api_call)
setattr(botocore.endpoint.Endpoint, "_encode_headers", original_encode_headers) setattr(botocore.endpoint.Endpoint, "_encode_headers", original_encode_headers)