From dab6318f90dba1fdbb758603879e430e038a3c85 Mon Sep 17 00:00:00 2001 From: Bert Blommers Date: Fri, 23 Jun 2023 15:12:32 +0000 Subject: [PATCH] Techdebt: Replace sure with regular asserts for DAX+DMS (#6435) --- tests/test_dax/test_dax.py | 13 +++---- tests/test_dms/test_dms.py | 70 ++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/tests/test_dax/test_dax.py b/tests/test_dax/test_dax.py index 32af80020..31a2a5c25 100644 --- a/tests/test_dax/test_dax.py +++ b/tests/test_dax/test_dax.py @@ -149,9 +149,10 @@ def test_describe_clusters_invalid_name(name): with pytest.raises(ClientError) as exc: client.describe_clusters(ClusterNames=[name]) err = exc.value.response["Error"] - err["Code"].should.equal("InvalidParameterValueException") - err["Message"].should.equal( - "Cluster ID specified is not a valid identifier. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens." + assert err["Code"] == "InvalidParameterValueException" + assert ( + err["Message"] + == "Cluster ID specified is not a valid identifier. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens." ) @@ -265,9 +266,9 @@ def test_describe_clusters_returns_nodes_after_some_time(): # Finished loading by now cluster = client.describe_clusters(ClusterNames=["daxcluster"])["Clusters"][0] - assert cluster["TotalNodes"].should.equal(3) - assert cluster["ActiveNodes"].should.equal(0) - assert cluster["Status"].should.equal("available") + assert cluster["TotalNodes"] == 3 + assert cluster["ActiveNodes"] == 0 + assert cluster["Status"] == "available" # Address Info is only available when the cluster is ready endpoint = cluster["ClusterDiscoveryEndpoint"] diff --git a/tests/test_dms/test_dms.py b/tests/test_dms/test_dms.py index 037a307d9..4c15a7a06 100644 --- a/tests/test_dms/test_dms.py +++ b/tests/test_dms/test_dms.py @@ -1,6 +1,5 @@ from botocore.exceptions import ClientError import boto3 -import sure # noqa # pylint: disable=unused-import import pytest import json @@ -25,19 +24,19 @@ def test_create_and_get_replication_task(): Filters=[{"Name": "replication-task-id", "Values": ["test"]}] ) - tasks["ReplicationTasks"].should.have.length_of(1) + assert len(tasks["ReplicationTasks"]) == 1 task = tasks["ReplicationTasks"][0] - task["ReplicationTaskIdentifier"].should.equal("test") - task["SourceEndpointArn"].should.equal("source-endpoint-arn") - task["TargetEndpointArn"].should.equal("target-endpoint-arn") - task["ReplicationInstanceArn"].should.equal("replication-instance-arn") - task["MigrationType"].should.equal("full-load") - task["Status"].should.equal("creating") - task["TableMappings"].should.equal('{"rules":[]}') - json.loads(task["TableMappings"]).should.be.a(dict) + assert task["ReplicationTaskIdentifier"] == "test" + assert task["SourceEndpointArn"] == "source-endpoint-arn" + assert task["TargetEndpointArn"] == "target-endpoint-arn" + assert task["ReplicationInstanceArn"] == "replication-instance-arn" + assert task["MigrationType"] == "full-load" + assert task["Status"] == "creating" + assert task["TableMappings"] == '{"rules":[]}' + assert isinstance(json.loads(task["TableMappings"]), dict) - task["ReplicationTaskSettings"].should.equal('{"Logging":{} }') - json.loads(task["ReplicationTaskSettings"]).should.be.a(dict) + assert task["ReplicationTaskSettings"] == '{"Logging":{} }' + assert isinstance(json.loads(task["ReplicationTaskSettings"]), dict) @mock_dms @@ -63,10 +62,11 @@ def test_create_existing_replication_task_throws_error(): TableMappings='{"rules":[]}', ) - ex.value.operation_name.should.equal("CreateReplicationTask") - ex.value.response["Error"]["Code"].should.equal("ResourceAlreadyExistsFault") - ex.value.response["Error"]["Message"].should.equal( - "The resource you are attempting to create already exists." + assert ex.value.operation_name == "CreateReplicationTask" + assert ex.value.response["Error"]["Code"] == "ResourceAlreadyExistsFault" + assert ( + ex.value.response["Error"]["Message"] + == "The resource you are attempting to create already exists." ) @@ -90,7 +90,7 @@ def test_start_replication_task(): Filters=[{"Name": "replication-task-arn", "Values": [task_arn]}] ) - tasks["ReplicationTasks"][0]["Status"].should.equal("running") + assert tasks["ReplicationTasks"][0]["Status"] == "running" @mock_dms @@ -103,10 +103,10 @@ def test_start_replication_task_throws_resource_not_found_error(): StartReplicationTaskType="start-replication", ) - ex.value.operation_name.should.equal("StartReplicationTask") - ex.value.response["Error"]["Code"].should.equal("ResourceNotFoundFault") - ex.value.response["Error"]["Message"].should.equal( - "Replication task could not be found." + assert ex.value.operation_name == "StartReplicationTask" + assert ex.value.response["Error"]["Code"] == "ResourceNotFoundFault" + assert ( + ex.value.response["Error"]["Message"] == "Replication task could not be found." ) @@ -127,11 +127,9 @@ def test_stop_replication_task_throws_invalid_state_error(): with pytest.raises(ClientError) as ex: client.stop_replication_task(ReplicationTaskArn=task_arn) - ex.value.operation_name.should.equal("StopReplicationTask") - ex.value.response["Error"]["Code"].should.equal("InvalidResourceStateFault") - ex.value.response["Error"]["Message"].should.equal( - "Replication task is not running" - ) + assert ex.value.operation_name == "StopReplicationTask" + assert ex.value.response["Error"]["Code"] == "InvalidResourceStateFault" + assert ex.value.response["Error"]["Message"] == "Replication task is not running" @mock_dms @@ -141,10 +139,10 @@ def test_stop_replication_task_throws_resource_not_found_error(): with pytest.raises(ClientError) as ex: client.stop_replication_task(ReplicationTaskArn="does-not-exist") - ex.value.operation_name.should.equal("StopReplicationTask") - ex.value.response["Error"]["Code"].should.equal("ResourceNotFoundFault") - ex.value.response["Error"]["Message"].should.equal( - "Replication task could not be found." + assert ex.value.operation_name == "StopReplicationTask" + assert ex.value.response["Error"]["Code"] == "ResourceNotFoundFault" + assert ( + ex.value.response["Error"]["Message"] == "Replication task could not be found." ) @@ -169,7 +167,7 @@ def test_stop_replication_task(): Filters=[{"Name": "replication-task-arn", "Values": [task_arn]}] ) - tasks["ReplicationTasks"][0]["Status"].should.equal("stopped") + assert tasks["ReplicationTasks"][0]["Status"] == "stopped" @mock_dms @@ -190,7 +188,7 @@ def test_delete_replication_task(): Filters=[{"Name": "replication-task-arn", "Values": [task_arn]}] ) - tasks["ReplicationTasks"].should.have.length_of(0) + assert len(tasks["ReplicationTasks"]) == 0 @mock_dms @@ -200,8 +198,8 @@ def test_delete_replication_task_throws_resource_not_found_error(): with pytest.raises(ClientError) as ex: client.delete_replication_task(ReplicationTaskArn="does-not-exist") - ex.value.operation_name.should.equal("DeleteReplicationTask") - ex.value.response["Error"]["Code"].should.equal("ResourceNotFoundFault") - ex.value.response["Error"]["Message"].should.equal( - "Replication task could not be found." + assert ex.value.operation_name == "DeleteReplicationTask" + assert ex.value.response["Error"]["Code"] == "ResourceNotFoundFault" + assert ( + ex.value.response["Error"]["Message"] == "Replication task could not be found." )