reorganize unit tests

Author: mattsb42-aws

test/unit/test_caches_base.py renamed to test/unit/aws_encryption_sdk/caches/test_base.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."""

test/unit/test_caches.py renamed to test/unit/aws_encryption_sdk/caches/test_caches.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 ..test_crypto import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_caches_crypto_cache_entry.py renamed to test/unit/aws_encryption_sdk/caches/test_crypto_cache_entry.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 ..test_crypto import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_caches_local.py renamed to test/unit/aws_encryption_sdk/caches/test_local.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."""

test/unit/test_caches_null.py renamed to test/unit/aws_encryption_sdk/caches/test_null.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
@@ -30,7 +29,6 @@
     _ECCCurveParameters,
     generate_ecc_signing_key,
 )
-
 from .test_crypto import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]

test/unit/aws_encryption_sdk/internal/crypto/authentication/__init__.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_crypto_prehashing_authenticator.py renamed to test/unit/aws_encryption_sdk/internal/crypto/authentication/test_prehashing_authenticator.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_crypto_authentication_signer.py renamed to test/unit/aws_encryption_sdk/internal/crypto/authentication/test_signer.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_crypto_authentication_verifier.py renamed to test/unit/aws_encryption_sdk/internal/crypto/authentication/test_verifier.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]
 

test/unit/aws_encryption_sdk/internal/crypto/encryption/__init__.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]
 

test/unit/test_crypto_encryption_decryptor.py renamed to test/unit/aws_encryption_sdk/internal/crypto/encryption/test_decryptor.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 ....test_values import VALUES
+from ....unit_test_utils import assert_prepped_stream_identity
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_crypto_encryption_encryptor.py renamed to test/unit/aws_encryption_sdk/internal/crypto/encryption/test_encryptor.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."""

test/unit/test_crypto.py renamed to test/unit/aws_encryption_sdk/internal/crypto/test_crypto.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_crypto_data_keys.py renamed to test/unit/aws_encryption_sdk/internal/crypto/test_data_keys.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]
 

test/unit/test_crypto_elliptic_curve.py renamed to test/unit/aws_encryption_sdk/internal/crypto/test_elliptic_curve.py

@@ -23,7 +23,7 @@
 )
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider, MasterKeyProviderConfig
 
-from .test_values import VALUES
+from ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_crypto_wrapping_keys.py renamed to test/unit/aws_encryption_sdk/internal/crypto/test_wrapping_keys.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."""

test/unit/test_deserialize.py renamed to test/unit/aws_encryption_sdk/internal/formatting/test_deserialize.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_encryption_context.py renamed to test/unit/aws_encryption_sdk/internal/formatting/test_encryption_context.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]
 

test/unit/test_serialize.py renamed to test/unit/aws_encryption_sdk/internal/formatting/test_serialize.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]
 

test/unit/test_defaults.py renamed to test/unit/aws_encryption_sdk/internal/test_defaults.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."""

test/unit/test_internal_structures.py renamed to test/unit/aws_encryption_sdk/internal/test_structures.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_util_str_ops.py renamed to test/unit/aws_encryption_sdk/internal/utils/test_str_ops.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]
 

test/unit/test_util_streams.py renamed to test/unit/aws_encryption_sdk/internal/utils/test_streams.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 ....test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_utils.py renamed to test/unit/aws_encryption_sdk/internal/utils/test_utils.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."""

test/unit/aws_encryption_sdk/key_providers/base/__init__.py

@@ -22,7 +22,7 @@
 from aws_encryption_sdk.materials_managers.default import DefaultCryptoMaterialsManager
 from aws_encryption_sdk.streaming_client import DecryptorConfig, EncryptorConfig, _ClientConfig
 
-from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs, build_valid_kwargs_list
+from ...unit_test_utils import all_invalid_kwargs, all_valid_kwargs, build_valid_kwargs_list
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_providers_base_master_key.py renamed to test/unit/aws_encryption_sdk/key_providers/base/test_base_master_key.py

@@ -23,8 +23,8 @@
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider
 from aws_encryption_sdk.streaming_client import _ClientConfig, _EncryptionStream
 
-from .test_values import VALUES
-from .unit_test_utils import assert_prepped_stream_identity
+from ...test_values import VALUES
+from ...unit_test_utils import assert_prepped_stream_identity
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_providers_base_master_key_config.py renamed to test/unit/aws_encryption_sdk/key_providers/base/test_base_master_key_config.py

@@ -22,7 +22,7 @@
 from aws_encryption_sdk.materials_managers.base import CryptoMaterialsManager
 from aws_encryption_sdk.streaming_client import StreamDecryptor
 
-from .test_values import VALUES
+from ...test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_providers_base_master_key_provider.py renamed to test/unit/aws_encryption_sdk/key_providers/base/test_base_master_key_provider.py

@@ -30,7 +30,7 @@
 from aws_encryption_sdk.streaming_client import StreamEncryptor
 from aws_encryption_sdk.structures import MessageHeader
 
-from .test_values import VALUES
+from ...test_values import VALUES
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 

test/unit/test_providers_base_master_key_provider_config.py renamed to test/unit/aws_encryption_sdk/key_providers/base/test_base_master_key_provider_config.py

@@ -16,7 +16,7 @@
 from aws_encryption_sdk.identifiers import Algorithm, ContentType, ObjectType, SerializationVersion
 from aws_encryption_sdk.structures import DataKey, EncryptedDataKey, MasterKeyInfo, MessageHeader, RawDataKey
 
-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]