Reorganize tests to easy readability and further development (#199)

* reorganize keyring tests to match #100 and keyring namespace to simplify names

* change aws_encryption_sdk.keyring to aws_encryption_sdk.keyrings for consistency in namespace names

* autoformat

* disable pylint similarity checks on imports

Because we provide multiple implementations of certain types of things (keyrings, etc),
this was triggering pylint due to them all needing to import the same types in order to function.

* reorganize functional and integration tests

* define structure for unit tests reorg

* reorganize unit tests

* rename test_values to vectors to avoid it being confused for a test file

* remove aws_encryption_sdk from functional test namespace

* remove aws_encryption_sdk from integration test namespace

* remove aws_encryption_sdk from unit test namespace

* rename test_crypto to vectors to avoid confusion

* autoformat

Author: mattsb42-aws

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."""

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."""

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."""

test/functional/test_f_crypto.py renamed to test/functional/internal/crypto/test_crypto.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."""

test/functional/test_f_crypto_iv.py renamed to test/functional/internal/crypto/test_iv.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."""

test/functional/test_f_aws_encryption_sdk_client.py renamed to test/functional/test_client.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/integration/__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."""

test/integration/test_i_aws_encrytion_sdk_client.py renamed to test/integration/test_client.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/integration/test_i_thread_safety.py renamed to test/integration/test_thread_safety.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/__init__.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]
 

test/unit/caches/__init__.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]
 

test/unit/test_caches_base.py renamed to test/unit/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/caches/test_caches.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]
 

test/unit/test_caches_crypto_cache_entry.py renamed to test/unit/caches/test_crypto_cache_entry.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]
 

test/unit/test_caches_local.py renamed to test/unit/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/caches/test_null.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]
 

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

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

test/unit/internal/crypto/authentication/__init__.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/test_crypto_prehashing_authenticator.py renamed to test/unit/internal/crypto/authentication/test_prehashing_authenticator.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_authentication_signer.py renamed to test/unit/internal/crypto/authentication/test_signer.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_authentication_verifier.py renamed to test/unit/internal/crypto/authentication/test_verifier.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]
 

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."""

test/unit/test_crypto_encryption_decryptor.py renamed to test/unit/internal/crypto/encryption/test_decryptor.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_encryption_encryptor.py renamed to test/unit/internal/crypto/encryption/test_encryptor.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]
 

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

test/unit/test_crypto_wrapping_keys.py renamed to test/unit/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_crypto.py renamed to test/unit/internal/crypto/vectors.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]
 

test/unit/internal/formatting/__init__.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_deserialize.py renamed to test/unit/internal/formatting/test_deserialize.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_encryption_context.py renamed to test/unit/internal/formatting/test_encryption_context.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_serialize.py renamed to test/unit/internal/formatting/test_serialize.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]
 

test/unit/test_defaults.py renamed to test/unit/internal/test_defaults.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_internal_structures.py renamed to test/unit/internal/test_structures.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]