aws · mattsb42-aws · Oct 7, 2019 · Oct 3, 2019 · Oct 3, 2019 · Oct 4, 2019
diff --git a/test/functional/__init__.py b/test/functional/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -10,3 +10,4 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/functional/internal/__init__.py b/test/functional/internal/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/functional/internal/crypto/__init__.py b/test/functional/internal/crypto/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/functional/test_f_crypto.py → ...functional/internal/crypto/test_crypto.py b/test/functional/test_f_crypto.py → ...functional/internal/crypto/test_crypto.py
diff --git a/test/functional/test_f_crypto_iv.py → test/functional/internal/crypto/test_iv.py b/test/functional/test_f_crypto_iv.py → test/functional/internal/crypto/test_iv.py
diff --git a/...ional/test_f_aws_encryption_sdk_client.py → test/functional/test_client.py b/...ional/test_f_aws_encryption_sdk_client.py → test/functional/test_client.py
diff --git a/test/integration/__init__.py b/test/integration/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -10,3 +10,4 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/...ration/test_i_aws_encrytion_sdk_client.py → test/integration/test_client.py b/...ration/test_i_aws_encrytion_sdk_client.py → test/integration/test_client.py
diff --git a/test/integration/test_i_thread_safety.py → test/integration/test_thread_safety.py b/test/integration/test_i_thread_safety.py → test/integration/test_thread_safety.py
diff --git a/test/unit/__init__.py b/test/unit/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -10,3 +10,4 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/caches/__init__.py b/test/unit/caches/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/test_caches_base.py → test/unit/caches/test_base.py b/test/unit/test_caches_base.py → test/unit/caches/test_base.py
diff --git a/test/unit/test_caches.py → test/unit/caches/test_caches.py b/test/unit/test_caches.py → test/unit/caches/test_caches.py
diff --git a/test/unit/test_caches_crypto_cache_entry.py → test/unit/caches/test_crypto_cache_entry.py b/test/unit/test_caches_crypto_cache_entry.py → test/unit/caches/test_crypto_cache_entry.py
diff --git a/test/unit/test_caches_local.py → test/unit/caches/test_local.py b/test/unit/test_caches_local.py → test/unit/caches/test_local.py
diff --git a/test/unit/test_caches_null.py → test/unit/caches/test_null.py b/test/unit/test_caches_null.py → test/unit/caches/test_null.py
diff --git a/test/unit/internal/__init__.py b/test/unit/internal/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/internal/crypto/__init__.py b/test/unit/internal/crypto/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/internal/crypto/authentication/__init__.py b/test/unit/internal/crypto/authentication/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/...t/test_crypto_prehashing_authenticator.py → ...tication/test_prehashing_authenticator.py b/...t/test_crypto_prehashing_authenticator.py → ...tication/test_prehashing_authenticator.py
diff --git a/...unit/test_crypto_authentication_signer.py → ...rnal/crypto/authentication/test_signer.py b/...unit/test_crypto_authentication_signer.py → ...rnal/crypto/authentication/test_signer.py
@@ -19,7 +19,7 @@
 from aws_encryption_sdk.internal.crypto.authentication import Signer
 from aws_encryption_sdk.internal.defaults import ALGORITHM
 
-from .test_crypto import VALUES
+from ..vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...it/test_crypto_authentication_verifier.py → ...al/crypto/authentication/test_verifier.py b/...it/test_crypto_authentication_verifier.py → ...al/crypto/authentication/test_verifier.py
@@ -19,7 +19,7 @@
 from aws_encryption_sdk.internal.crypto.authentication import Verifier
 from aws_encryption_sdk.internal.defaults import ALGORITHM
 
-from .test_crypto import VALUES
+from ..vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/internal/crypto/encryption/__init__.py b/test/unit/internal/crypto/encryption/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/.../unit/test_crypto_encryption_decryptor.py → ...ernal/crypto/encryption/test_decryptor.py b/.../unit/test_crypto_encryption_decryptor.py → ...ernal/crypto/encryption/test_decryptor.py
diff --git a/.../unit/test_crypto_encryption_encryptor.py → ...ernal/crypto/encryption/test_encryptor.py b/.../unit/test_crypto_encryption_encryptor.py → ...ernal/crypto/encryption/test_encryptor.py
diff --git a/test/unit/test_crypto_data_keys.py → test/unit/internal/crypto/test_data_keys.py b/test/unit/test_crypto_data_keys.py → test/unit/internal/crypto/test_data_keys.py
diff --git a/test/unit/test_crypto_elliptic_curve.py → ...it/internal/crypto/test_elliptic_curve.py b/test/unit/test_crypto_elliptic_curve.py → ...it/internal/crypto/test_elliptic_curve.py
@@ -17,7 +17,6 @@
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.utils import InterfaceNotImplemented
 from mock import MagicMock, sentinel
-from pytest_mock import mocker  # noqa pylint: disable=unused-import
 
 import aws_encryption_sdk.internal.crypto.elliptic_curve
 from aws_encryption_sdk.exceptions import NotSupportedError
@@ -31,7 +30,7 @@
     generate_ecc_signing_key,
 )
 
-from .test_crypto import VALUES
+from .vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/test_crypto_wrapping_keys.py → ...nit/internal/crypto/test_wrapping_keys.py b/test/unit/test_crypto_wrapping_keys.py → ...nit/internal/crypto/test_wrapping_keys.py
@@ -21,7 +21,7 @@
 from aws_encryption_sdk.internal.crypto.wrapping_keys import WrappingKey
 from aws_encryption_sdk.internal.structures import EncryptedData
 
-from .test_crypto import VALUES
+from .vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/test_crypto.py → test/unit/internal/crypto/vectors.py b/test/unit/test_crypto.py → test/unit/internal/crypto/vectors.py
diff --git a/test/unit/internal/formatting/__init__.py b/test/unit/internal/formatting/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/test_deserialize.py → ...t/internal/formatting/test_deserialize.py b/test/unit/test_deserialize.py → ...t/internal/formatting/test_deserialize.py
@@ -23,7 +23,7 @@
 from aws_encryption_sdk.identifiers import AlgorithmSuite
 from aws_encryption_sdk.internal.structures import EncryptedData
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/test_encryption_context.py → ...nal/formatting/test_encryption_context.py b/test/unit/test_encryption_context.py → ...nal/formatting/test_encryption_context.py
@@ -18,7 +18,7 @@
 from aws_encryption_sdk.exceptions import SerializationError
 from aws_encryption_sdk.identifiers import ContentAADString
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/test_serialize.py → ...nit/internal/formatting/test_serialize.py b/test/unit/test_serialize.py → ...nit/internal/formatting/test_serialize.py
@@ -21,7 +21,7 @@
 from aws_encryption_sdk.internal.structures import EncryptedData
 from aws_encryption_sdk.structures import EncryptedDataKey, MasterKeyInfo
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/test_defaults.py → test/unit/internal/test_defaults.py b/test/unit/test_defaults.py → test/unit/internal/test_defaults.py
diff --git a/test/unit/test_internal_structures.py → test/unit/internal/test_structures.py b/test/unit/test_internal_structures.py → test/unit/internal/test_structures.py
@@ -21,7 +21,7 @@
     MessageNoFrameBody,
 )
 
-from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs
+from ..unit_test_utils import all_invalid_kwargs, all_valid_kwargs
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/internal/utils/__init__.py b/test/unit/internal/utils/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/test_util_str_ops.py → test/unit/internal/utils/test_str_ops.py b/test/unit/test_util_str_ops.py → test/unit/internal/utils/test_str_ops.py
diff --git a/test/unit/test_util_streams.py → test/unit/internal/utils/test_streams.py b/test/unit/test_util_streams.py → test/unit/internal/utils/test_streams.py
@@ -19,7 +19,7 @@
 from aws_encryption_sdk.internal.str_ops import to_bytes, to_str
 from aws_encryption_sdk.internal.utils.streams import InsistentReaderBytesIO, ROStream, TeeStream
 
-from .unit_test_utils import ExactlyTwoReads, NothingButRead, SometimesIncompleteReaderIO
+from ...unit_test_utils import ExactlyTwoReads, NothingButRead, SometimesIncompleteReaderIO
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/test_utils.py → test/unit/internal/utils/test_utils.py b/test/unit/test_utils.py → test/unit/internal/utils/test_utils.py
@@ -24,8 +24,8 @@
 from aws_encryption_sdk.keyrings.base import EncryptedDataKey
 from aws_encryption_sdk.structures import DataKey, MasterKeyInfo, RawDataKey
 
-from .test_values import VALUES
-from .unit_test_utils import assert_prepped_stream_identity
+from ...unit_test_utils import assert_prepped_stream_identity
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/key_providers/__init__.py b/test/unit/key_providers/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/key_providers/base/__init__.py b/test/unit/key_providers/base/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/test_providers_base_master_key.py → ...ey_providers/base/test_base_master_key.py b/test/unit/test_providers_base_master_key.py → ...ey_providers/base/test_base_master_key.py
@@ -20,7 +20,7 @@
 from aws_encryption_sdk.key_providers.base import MasterKey, MasterKeyConfig, MasterKeyProvider
 from aws_encryption_sdk.structures import MasterKeyInfo
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/.../test_providers_base_master_key_config.py → ...iders/base/test_base_master_key_config.py b/.../test_providers_base_master_key_config.py → ...iders/base/test_base_master_key_config.py
@@ -15,7 +15,7 @@
 
 from aws_encryption_sdk.key_providers.base import MasterKeyConfig
 
-from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs
+from ...unit_test_utils import all_invalid_kwargs, all_valid_kwargs
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...est_providers_base_master_key_provider.py → ...ers/base/test_base_master_key_provider.py b/...est_providers_base_master_key_provider.py → ...ers/base/test_base_master_key_provider.py
@@ -23,7 +23,7 @@
 )
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider, MasterKeyProviderConfig
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...viders_base_master_key_provider_config.py → ...e/test_base_master_key_provider_config.py b/...viders_base_master_key_provider_config.py → ...e/test_base_master_key_provider_config.py
diff --git a/test/unit/key_providers/kms/__init__.py b/test/unit/key_providers/kms/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/test_providers_kms_master_key.py → .../key_providers/kms/test_kms_master_key.py b/test/unit/test_providers_kms_master_key.py → .../key_providers/kms/test_kms_master_key.py
@@ -22,7 +22,7 @@
 from aws_encryption_sdk.key_providers.kms import KMSMasterKey, KMSMasterKeyConfig
 from aws_encryption_sdk.structures import DataKey, EncryptedDataKey, MasterKeyInfo
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...t/test_providers_kms_master_key_config.py → ...oviders/kms/test_kms_master_key_config.py b/...t/test_providers_kms_master_key_config.py → ...oviders/kms/test_kms_master_key_config.py
@@ -17,7 +17,7 @@
 from aws_encryption_sdk.key_providers.base import MasterKeyConfig
 from aws_encryption_sdk.key_providers.kms import _PROVIDER_ID, KMSMasterKeyConfig
 
-from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs
+from ...unit_test_utils import all_invalid_kwargs, all_valid_kwargs
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...test_providers_kms_master_key_provider.py → ...iders/kms/test_kms_master_key_provider.py b/...test_providers_kms_master_key_provider.py → ...iders/kms/test_kms_master_key_provider.py
diff --git a/...oviders_kms_master_key_provider_config.py → ...ms/test_kms_master_key_provider_config.py b/...oviders_kms_master_key_provider_config.py → ...ms/test_kms_master_key_provider_config.py
@@ -17,7 +17,7 @@
 from aws_encryption_sdk.key_providers.base import MasterKeyProviderConfig
 from aws_encryption_sdk.key_providers.kms import KMSMasterKeyProviderConfig
 
-from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs
+from ...unit_test_utils import all_invalid_kwargs, all_valid_kwargs
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/test/unit/key_providers/raw/__init__.py b/test/unit/key_providers/raw/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Dummy stub to make linters work better."""
diff --git a/test/unit/test_providers_raw_master_key.py → .../key_providers/raw/test_raw_master_key.py b/test/unit/test_providers_raw_master_key.py → .../key_providers/raw/test_raw_master_key.py
@@ -20,7 +20,7 @@
 from aws_encryption_sdk.key_providers.raw import RawMasterKey, RawMasterKeyConfig
 from aws_encryption_sdk.structures import DataKey, EncryptedDataKey, MasterKeyInfo, RawDataKey
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...t/test_providers_raw_master_key_config.py → ...oviders/raw/test_raw_master_key_config.py b/...t/test_providers_raw_master_key_config.py → ...oviders/raw/test_raw_master_key_config.py
@@ -19,7 +19,7 @@
 from aws_encryption_sdk.key_providers.base import MasterKeyConfig
 from aws_encryption_sdk.key_providers.raw import RawMasterKeyConfig
 
-from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs
+from ...unit_test_utils import all_invalid_kwargs, all_valid_kwargs
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

diff --git a/...test_providers_raw_master_key_provider.py → ...iders/raw/test_raw_master_key_provider.py b/...test_providers_raw_master_key_provider.py → ...iders/raw/test_raw_master_key_provider.py
@@ -18,7 +18,7 @@
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider, MasterKeyProviderConfig
 from aws_encryption_sdk.key_providers.raw import RawMasterKeyProvider
 
-from .test_values import VALUES
+from ...vectors import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]