Merge pull request #98 from mattsb42-aws/pytest4

Pytest4

Author: mattsb42-aws

.gitignore

@@ -20,4 +20,5 @@ docs/build
 .pytest_cache
 
 #PyCharm
-.idea/
+.idea/
+venv/

test/integration/integration_test_utils.py

@@ -28,8 +28,7 @@
 DDB_TABLE_NAME = "DDB_ENCRYPTION_CLIENT_TEST_TABLE_NAME"
 
 
-@pytest.fixture
-def cmk_arn():
+def cmk_arn_value():
     """Retrieve the target CMK ARN from environment variable."""
     arn = os.environ.get(AWS_KMS_KEY_ID, None)
     if arn is None:
@@ -43,9 +42,15 @@ def cmk_arn():
     raise ValueError("KMS CMK ARN provided for integration tests must be a key not an alias")
 
 
+@pytest.fixture
+def cmk_arn():
+    """As of Pytest 4.0.0, fixtures cannot be called directly."""
+    return cmk_arn_value()
+
+
 @pytest.fixture
 def aws_kms_cmp():
-    return AwsKmsCryptographicMaterialsProvider(key_id=cmk_arn())
+    return AwsKmsCryptographicMaterialsProvider(key_id=cmk_arn_value())
 
 
 @pytest.fixture