get rid of path patching (that was broken by isort anyway) in favor of relative imports for test helpers used in different test groups

Author: mattsb42-aws

test/__init__.py

@@ -0,0 +1,13 @@
+# Copyright 2018 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.
+"""Stub to allow relative imports between test groups."""

test/acceptance/acceptance_test_utils.py

@@ -14,12 +14,10 @@
 import base64
 import json
 import os
-import sys
 from collections import defaultdict
 from functools import partial
 
 import boto3
-import functional_test_vector_generators  # noqa: E402,I100 pylint: disable=import-error,wrong-import-position
 import pytest
 from six.moves.urllib.parse import urlparse  # moves confuse pylint: disable=wrong-import-order
 
@@ -33,8 +31,7 @@
 from dynamodb_encryption_sdk.materials.raw import RawDecryptionMaterials
 from dynamodb_encryption_sdk.structures import AttributeActions
 
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "functional"))
-
+from ..functional import functional_test_vector_generators
 
 _ENCRYPTED_ITEM_VECTORS_DIR = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), "..", "vectors", "encrypted_item"

test/integration/integration_test_utils.py

@@ -12,17 +12,13 @@
 # language governing permissions and limitations under the License.
 """Helper utilities for integration tests."""
 import os
-import sys
 
-# Convenience imports
-import functional_test_utils  # noqa: E402,F401,I100 pylint: disable=import-error,unused-import,wrong-import-position
-import hypothesis_strategies  # noqa: E402,F401,I100 pylint: disable=import-error,unused-import,wrong-import-position
 import pytest
 
 from dynamodb_encryption_sdk.material_providers.aws_kms import AwsKmsCryptographicMaterialsProvider
 
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "functional"))
-
+# convenience imports
+from ..functional import functional_test_utils, hypothesis_strategies
 
 AWS_KMS_KEY_ID = "AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID"
 DDB_TABLE_NAME = "DDB_ENCRYPTION_CLIENT_TEST_TABLE_NAME"