Fix

Author: imabhichow

DynamoDbEncryption/runtimes/python/test/integ/legacy/test_client.py

@@ -45,14 +45,11 @@
 )
 
 
-# TODO: standard_dicts tests were failing with TypeError: __str__ returned non-string (type bytes)
-#  Initial assumption is that some thing is wrong with my test setup.
 # Creates a matrix of tests for each value in param,
 # with a user-friendly string for test output:
 # expect_standard_dictionaries = True -> "standard_dicts"
 # expect_standard_dictionaries = False -> "ddb_json"
-# @pytest.fixture(params=[True, False], ids=["standard_dicts", "ddb_json"])
-@pytest.fixture(params=[False], ids=["ddb_json"])
+@pytest.fixture(params=[True, False], ids=["standard_dicts", "ddb_json"])
 def expect_standard_dictionaries(request):
     return request.param
 

DynamoDbEncryption/runtimes/python/test/integ/legacy/test_paginator.py

@@ -42,14 +42,11 @@
 )
 
 
-# TODO: standard_dicts tests were failing with TypeError: __str__ returned non-string (type bytes)
-#  Initial assumption is that some thing is wrong with my test setup.
 # Creates a matrix of tests for each value in param,
 # with a user-friendly string for test output:
 # expect_standard_dictionaries = True -> "standard_dicts"
 # expect_standard_dictionaries = False -> "ddb_json"
-# @pytest.fixture(params=[True, False], ids=["standard_dicts", "ddb_json"])
-@pytest.fixture(params=[False], ids=["ddb_json"])
+@pytest.fixture(params=[True, False], ids=["standard_dicts", "ddb_json"])
 def expect_standard_dictionaries(request):
     return request.param
 

DynamoDbEncryption/runtimes/python/test/integ/legacy/utils.py

@@ -55,7 +55,7 @@ def create_legacy_encrypted_client(attribute_actions=None, expect_standard_dicti
     """Create a legacy DynamoDB encrypted client."""
     cmp = AwsKmsCryptographicMaterialsProvider(key_id=INTEG_TEST_DEFAULT_KMS_KEY_ID)
     return LegacyEncryptedClient(
-        client=boto3.client("dynamodb"),
+        client=plaintext_client(expect_standard_dictionaries),
         materials_provider=cmp,
         attribute_actions=attribute_actions,
         expect_standard_dictionaries=expect_standard_dictionaries,
@@ -124,6 +124,14 @@ def create_encryption_config(legacy_encryptor=None, legacy_policy=None):
     return DynamoDbTablesEncryptionConfig(table_encryption_configs=table_configs)
 
 
+def plaintext_client(expect_standard_dictionaries):
+    if expect_standard_dictionaries:
+        client = boto3.resource("dynamodb").Table(INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME).meta.client
+    else:
+        client = boto3.client("dynamodb")
+    return client
+
+
 def encrypted_client_with_legacy_override(
     legacy_encryptor=None, legacy_policy=None, expect_standard_dictionaries=False
 ):
@@ -132,7 +140,7 @@ def encrypted_client_with_legacy_override(
 
     # Create the EncryptedClient
     return EncryptedClient(
-        client=boto3.client("dynamodb"),
+        client=plaintext_client(expect_standard_dictionaries),
         encryption_config=tables_config,
         expect_standard_dictionaries=expect_standard_dictionaries,
     )
@@ -159,17 +167,3 @@ def encrypted_resource_with_legacy_override(legacy_encryptor=None, legacy_policy
         resource=boto3.resource("dynamodb"),
         encryption_config=tables_config,
     )
-
-
-def cleanup_ddb_items(items):
-    """Delete DynamoDB items from the test table."""
-    client = boto3.client("dynamodb")
-    for item in items:
-        try:
-            client.delete_item(
-                TableName=INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
-                Key={"partition_key": item["partition_key"], "sort_key": item["sort_key"]},
-            )
-        except Exception:
-            # Ignore errors on cleanup
-            pass