fixup! ELB Automatic resource naming

* Undid pep8 fixes on non-touched files * Fixed template arg documentation on config:s3 and config:elb
ministryofjustice · Aug 5, 2015 · fcb671f · fcb671f
1 parent a2ca850
commit fcb671f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/bootstrap_cfn/config.py b/bootstrap_cfn/config.py
@@ -254,7 +254,7 @@ def s3(self, template):
 
         Args:
             template:
-                The cloudformation template file
+                The troposphere.Template object
         """
         # As there are no required fields, although we may not have any
         # subkeys we still need to be able to have a parent key 's3:' to
@@ -308,12 +308,12 @@ def ssl(self):
     def rds(self, template):
         """
         Create an RDS resource configuration from the config file data
-        and add it to the troposphere template. Outputs for the RDS name,
+        and add it to the  troposphere.Template. Outputs for the RDS name,
         host and port are created.
 
         Args:
             template:
-                The cloudformation template file
+                The troposphere.Template object
         """
         # REQUIRED FIELDS MAPPING
         required_fields = {

diff --git a/tests/test.py b/tests/test.py
@@ -176,7 +176,7 @@ def test_stack_wait_for_stack_not_done(self):
         with self.assertRaises(errors.CfnTimeoutError):
             print cloudformation.Cloudformation(
                 self.env.aws_profile).wait_for_stack_done(self.stack_name, 1, 1)
-
+        
     def test_wait_for_stack_done(self):
         stack_evt_mock = mock.Mock()
         rt = mock.PropertyMock(return_value='AWS::CloudFormation::Stack')

diff --git a/tests/test_iam.py b/tests/test_iam.py
@@ -81,25 +81,19 @@ class TestIAM(unittest.TestCase):
                 {
                     "server_certificate":
                     {
-                        "certificate_body": (
-                            "-----BEGIN CERTIFICATE-----"
-                            "CERT1CERT1CERT1CERT1CERT1CER"
-                            "-----END CERTIFICATE-----"
-                        ),
-                        "certificate_chain": (
-                            "-----BEGIN CERTIFICATE-----"
-                            "CHAIN1CHAIN1CHAIN1CHAIN1CHA"
-                            "-----END CERTIFICATE-----"
-                        ),
-                        "certificate_key": (
-                            "-----BEGIN PRIVATE KEY-----"
-                            "KEY1KEY1KEY1KEY1KEY1KEY1KEY"
-                            "-----END PRIVATE KEY-----"
-                        ),
+                        "certificate_body": ("-----BEGIN CERTIFICATE-----"
+                                             "CERT1CERT1CERT1CERT1CERT1CER"
+                                             "-----END CERTIFICATE-----"),
+                        "certificate_chain": ("-----BEGIN CERTIFICATE-----"
+                                              "CHAIN1CHAIN1CHAIN1CHAIN1CHA"
+                                              "-----END CERTIFICATE-----"),
+                        "certificate_key": ("-----BEGIN PRIVATE KEY-----"
+                                            "KEY1KEY1KEY1KEY1KEY1KEY1KEY"
+                                            "-----END PRIVATE KEY-----"),
+                        }
                     }
                 }
             }
-        }
     successful_response = \
         {
             "status": 200,