pylint-tests update and fixes

Author: mattsb42-aws

test/acceptance/acceptance_test_utils.py

@@ -18,7 +18,7 @@
 import sys
 
 import pytest
-from six.moves.urllib.parse import urlparse
+from six.moves.urllib.parse import urlparse  # moves confuse pylint: disable=wrong-import-order
 
 from dynamodb_encryption_sdk.delegated_keys.jce import JceNameLocalDelegatedKey
 from dynamodb_encryption_sdk.identifiers import EncryptionKeyTypes, KeyEncodingType
@@ -34,7 +34,7 @@
 ))
 
 # Convenience imports
-import functional_test_vector_generators  # noqa: E402,I100
+import functional_test_vector_generators  # noqa: E402,I100 pylint: disable=import-error,wrong-import-position
 
 _ENCRYPTED_ITEM_VECTORS_DIR = os.path.join(
     os.path.abspath(os.path.dirname(__file__)),
@@ -66,6 +66,7 @@ def _decode_item(item):
 
 
 def _build_plaintext_items(plaintext_file, version):
+    # pylint: disable=too-many-locals
     with open(plaintext_file) as f:
         plaintext_data = json.load(f)
 
@@ -209,6 +210,7 @@ def _expand_items(ciphertext_items, plaintext_items):
 
 
 def load_scenarios():
+    # pylint: disable=too-many-locals
     with open(_SCENARIO_FILE) as f:
         scenarios = json.load(f)
     keys_file = _filename_from_uri(scenarios['keys'])

test/functional/encrypted/test_client.py

@@ -21,7 +21,7 @@
     check_encrypted_item, cycle_batch_item_check, set_parametrized_actions, set_parametrized_cmp,
     set_parametrized_item, TEST_KEY, TEST_TABLE_NAME
 )
-from ..functional_test_utils import example_table  # noqa
+from ..functional_test_utils import example_table  # noqa pylint: disable=unused-import
 from ..hypothesis_strategies import ddb_items, SLOW_SETTINGS, VERY_SLOW_SETTINGS
 
 pytestmark = [pytest.mark.functional, pytest.mark.local]

test/functional/encrypted/test_resource.py

@@ -18,7 +18,7 @@
 from ..functional_test_utils import (
     cycle_batch_item_check, set_parametrized_actions, set_parametrized_cmp, set_parametrized_item, TEST_TABLE_NAME
 )
-from ..functional_test_utils import example_table  # noqa
+from ..functional_test_utils import example_table  # noqa pylint: disable=unused-import
 
 pytestmark = [pytest.mark.functional, pytest.mark.local]
 

test/functional/encrypted/test_table.py

@@ -20,7 +20,7 @@
     check_encrypted_item, set_parametrized_actions, set_parametrized_cmp, set_parametrized_item,
     TEST_KEY, TEST_TABLE_NAME
 )
-from ..functional_test_utils import example_table  # noqa
+from ..functional_test_utils import example_table  # noqa pylint: disable=unused-import
 from ..hypothesis_strategies import ddb_items, SLOW_SETTINGS, VERY_SLOW_SETTINGS
 
 pytestmark = [pytest.mark.functional, pytest.mark.local]

test/functional/functional_test_utils.py

@@ -362,13 +362,13 @@ def check_encrypted_item(plaintext_item, ciphertext_item, attribute_actions):
 
 
 def _matching_key(actual_item, expected):
-        expected_item = [
-            i for i in expected
-            if i['partition_attribute'] == actual_item['partition_attribute'] and
-            i['sort_attribute'] == actual_item['sort_attribute']
-        ]
-        assert len(expected_item) == 1
-        return expected_item[0]
+    expected_item = [
+        i for i in expected
+        if i['partition_attribute'] == actual_item['partition_attribute'] and
+        i['sort_attribute'] == actual_item['sort_attribute']
+    ]
+    assert len(expected_item) == 1
+    return expected_item[0]
 
 
 def _nop_transformer(item):

test/integration/integration_test_utils.py

@@ -25,8 +25,8 @@
 ))
 
 # Convenience imports
-import functional_test_utils  # noqa: E402,F401,I100
-import hypothesis_strategies  # noqa: E402,F401,I100
+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
 
 AWS_KMS_KEY_ID = 'AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID'
 

test/integration/material_providers/test_aws_kms.py

@@ -16,7 +16,7 @@
 
 from dynamodb_encryption_sdk.encrypted import CryptoConfig
 from dynamodb_encryption_sdk.structures import EncryptionContext
-from ..integration_test_utils import aws_kms_cmp  # noqa
+from ..integration_test_utils import aws_kms_cmp  # noqa pylint: disable=unused-import
 from ..integration_test_utils import functional_test_utils, hypothesis_strategies
 
 pytestmark = pytest.mark.integ

tox.ini

@@ -134,7 +134,10 @@ deps = {[testenv:pylint]deps}
 commands =
     pylint \
         --rcfile=test/pylintrc \
-        test/unit/
+        test/unit/ \
+        test/acceptance/ \
+        test/functional/ \
+        test/integration/
 
 [testenv:doc8]
 basepython = python3