More coverage

geeknam · Mar 14, 2016 · f3485fa · f3485fa
1 parent d5b0afd
commit f3485fa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/examples/simple_instance/ec2_instance.py b/examples/simple_instance/ec2_instance.py
@@ -9,6 +9,8 @@
 @register('ec2')
 class EC2Template(BaseTemplate, EnvironmentMixin):
 
+    description = 'EC2 with variable instance type depending on environment'
+
     instance = Instance(
         'Ec2Instance',
         ImageId=FindInMap('RegionMap', Ref('AWS::Region'), 'AMI'),

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -1,9 +1,9 @@
 import os
-import  json
+import json
 import shutil
 import unittest
 import yaml
-from mock import patch, Mock
+from mock import patch
 from cloudarmy.cli import CloudArmy
 from cloudarmy.core import registry
 from cloudarmy.core.base import BaseTemplate
@@ -67,7 +67,7 @@ def test_load_templates(self):
             issubclass(registry.templates[0]['template'], BaseTemplate)
         )
 
-    def test_s3_directory(self):
+    def test_s3_root_dir(self):
         ca = CloudArmy(
             template_dir=self.example_project_dir,
             environment_type='staging'
@@ -77,6 +77,16 @@ def test_s3_directory(self):
             'https://mys3bucket.s3.amazonaws.com/templates'
         )
 
+    def test_s3_directory(self):
+        ca = CloudArmy(
+            template_dir=self.example_project_dir,
+            environment_type='staging'
+        )
+        self.assertEqual(
+            ca.s3_directory,
+            'templates'
+        )
+
     def test_s3_bucket_name(self):
         ca = CloudArmy(
             template_dir=self.example_project_dir,