Ed & Cameron | Move unit tests to separate directory

tests/unit/test_ec2_rule_service.py

@@ -6,7 +6,7 @@ from mock import Mock, call
 
 from nova.virt.ec2.ec2_rule_service import EC2RuleService
 from nova.virt.ec2.ec2_rule_transformer import EC2RuleTransformer
-from nova.virt.ec2.tests.fake_ec2_rule_builder import FakeEC2RuleBuilder
+
 
 class TestEC2RuleService(unittest.TestCase):
 

tests/unit/test_ec2_rule_transformer.py

@@ -1,9 +1,10 @@
-from nova.virt.ec2.ec2_rule_transformer import EC2RuleTransformer
-from mock import Mock
-from fake_ec2_rule_builder import FakeEC2RuleBuilder
-
 import unittest
 
+from mock import Mock
+
+from nova.virt.ec2.ec2_rule_transformer import EC2RuleTransformer
+from fake_ec2_rule_builder import FakeEC2RuleBuilder
+
 
 class TestEC2RuleTransformer(unittest.TestCase):
 

tests/unit/test_openstack_group_service.py

@@ -1,6 +1,8 @@
 import unittest
+
 from mock import Mock
 from novaclient.v1_1.security_groups import SecurityGroupManager
+
 from nova.virt.ec2.openstack_group_service import OpenstackGroupService
 
 

tests/unit/test_rule_refresher.py

@@ -4,7 +4,6 @@ from boto.ec2 import EC2Connection
 from mock import Mock
 
 from nova.virt.ec2.rule_refresher import RuleRefresher
-
 from nova.virt.ec2.rule import Rule
 from nova.virt.ec2.openstack_rule_service import OpenstackRuleService
 from nova.virt.ec2.ec2_rule_service import EC2RuleService