pylint and pytest fixes

Author: ammokhov

src/cloudformation_cli_python_lib/recast.py

@@ -89,8 +89,10 @@ def _field_to_type(field: Any, key: str, classes: Dict[str, Any]) -> Any:  # noq
         possible_types = field.__args__
         if not possible_types:
             raise InvalidRequest(f"Cannot process type {field} for field {key}")
-    except AttributeError as ae:
-        raise InvalidRequest(f"Cannot process type {field} for field {key}") from ae
+    except AttributeError as attribute_error:
+        raise InvalidRequest(
+            f"Cannot process type {field} for field {key}"
+        ) from attribute_error
     # Assuming that the union is generated from typing.Optional, so only
     # contains one type and None
     # pylint: disable=unidiomatic-typecheck

tests/lib/interface_test.py

@@ -5,15 +5,16 @@
 
 import boto3
 import pytest
-import hypothesis.strategies as s
-from hypothesis import given
 from cloudformation_cli_python_lib.interface import (
     BaseModel,
     HandlerErrorCode,
     OperationStatus,
     ProgressEvent,
 )
 
+import hypothesis.strategies as s
+from hypothesis import given
+
 
 @pytest.fixture(scope="module")
 def client():

tests/lib/metrics_test.py

@@ -5,14 +5,15 @@
 
 import boto3
 import pytest
-from botocore.stub import Stubber
 from cloudformation_cli_python_lib.interface import Action, MetricTypes, StandardUnit
 from cloudformation_cli_python_lib.metrics import (
     MetricPublisher,
     MetricsPublisherProxy,
     format_dimensions,
 )
 
+from botocore.stub import Stubber
+
 RESOURCE_TYPE = "Aa::Bb::Cc"
 NAMESPACE = MetricsPublisherProxy._make_namespace(  # pylint: disable=protected-access
     RESOURCE_TYPE

tests/lib/utils_test.py

@@ -3,8 +3,6 @@
 from unittest.mock import Mock, call, sentinel
 
 import pytest
-import hypothesis.strategies as s
-from hypothesis import given
 from cloudformation_cli_python_lib.exceptions import InvalidRequest
 from cloudformation_cli_python_lib.interface import BaseModel
 from cloudformation_cli_python_lib.utils import (
@@ -14,6 +12,9 @@
     deserialize_list,
 )
 
+import hypothesis.strategies as s
+from hypothesis import given
+
 
 def roundtrip(value):
     return json.loads(json.dumps(value, cls=KitchenSinkEncoder))

tests/plugin/codegen_test.py

@@ -94,6 +94,10 @@ def test_initialize(project):
         "README.md",
         "foo-bar-baz.json",
         "requirements.txt",
+        "inputs",
+        "inputs/inputs_1_update.json",
+        "inputs/inputs_1_invalid.json",
+        "inputs/inputs_1_create.json",
         "src",
         "src/foo_bar_baz",
         "src/foo_bar_baz/__init__.py",