Skip to content

Commit ba101bc

Browse files
committed
remove direct fixture call disabled in Pytest 4.0.0
1 parent 2014edc commit ba101bc

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

test/integration/integration_test_utils.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
DDB_TABLE_NAME = "DDB_ENCRYPTION_CLIENT_TEST_TABLE_NAME"
2929

3030

31-
@pytest.fixture
32-
def cmk_arn():
31+
def cmk_arn_value():
3332
"""Retrieve the target CMK ARN from environment variable."""
3433
arn = os.environ.get(AWS_KMS_KEY_ID, None)
3534
if arn is None:
@@ -43,9 +42,15 @@ def cmk_arn():
4342
raise ValueError("KMS CMK ARN provided for integration tests must be a key not an alias")
4443

4544

45+
@pytest.fixture
46+
def cmk_arn():
47+
"""As of Pytest 4.0.0, fixtures cannot be called directly."""
48+
return cmk_arn_value()
49+
50+
4651
@pytest.fixture
4752
def aws_kms_cmp():
48-
return AwsKmsCryptographicMaterialsProvider(key_id=cmk_arn())
53+
return AwsKmsCryptographicMaterialsProvider(key_id=cmk_arn_value())
4954

5055

5156
@pytest.fixture

0 commit comments

Comments
 (0)