From 6d4ec264a5bdb9977b4a2267e7abbd1e89a5960b Mon Sep 17 00:00:00 2001
From: cameron-r <crowshanbin@gmail.com>
Date: Wed, 5 Nov 2014 14:00:03 -0600
Subject: [PATCH] Ed & Cameron | Move unit tests to separate directory

---
 tests/unit/__init__.py                           | 0
 tests/{ => unit}/fake_ec2_rule_builder.py        | 0
 tests/{ => unit}/test_ec2_rule_service.py        | 2 +-
 tests/{ => unit}/test_ec2_rule_transformer.py    | 9 +++++----
 tests/{ => unit}/test_openstack_group_service.py | 2 ++
 tests/{ => unit}/test_openstack_rule_service.py  | 0
 tests/{ => unit}/test_rule_comparator.py         | 0
 tests/{ => unit}/test_rule_refresher.py          | 1 -
 8 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 tests/unit/__init__.py
 rename tests/{ => unit}/fake_ec2_rule_builder.py (100%)
 rename tests/{ => unit}/test_ec2_rule_service.py (94%)
 rename tests/{ => unit}/test_ec2_rule_transformer.py (96%)
 rename tests/{ => unit}/test_openstack_group_service.py (96%)
 rename tests/{ => unit}/test_openstack_rule_service.py (100%)
 rename tests/{ => unit}/test_rule_comparator.py (100%)
 rename tests/{ => unit}/test_rule_refresher.py (99%)

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/fake_ec2_rule_builder.py b/tests/unit/fake_ec2_rule_builder.py
similarity index 100%
rename from tests/fake_ec2_rule_builder.py
rename to tests/unit/fake_ec2_rule_builder.py
diff --git a/tests/test_ec2_rule_service.py b/tests/unit/test_ec2_rule_service.py
similarity index 94%
rename from tests/test_ec2_rule_service.py
rename to tests/unit/test_ec2_rule_service.py
index d50adcd..6acecf9 100644
--- a/tests/test_ec2_rule_service.py
+++ b/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):
 
diff --git a/tests/test_ec2_rule_transformer.py b/tests/unit/test_ec2_rule_transformer.py
similarity index 96%
rename from tests/test_ec2_rule_transformer.py
rename to tests/unit/test_ec2_rule_transformer.py
index b136dfe..335af04 100644
--- a/tests/test_ec2_rule_transformer.py
+++ b/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):
 
diff --git a/tests/test_openstack_group_service.py b/tests/unit/test_openstack_group_service.py
similarity index 96%
rename from tests/test_openstack_group_service.py
rename to tests/unit/test_openstack_group_service.py
index 362e209..21404f9 100644
--- a/tests/test_openstack_group_service.py
+++ b/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
 
 
diff --git a/tests/test_openstack_rule_service.py b/tests/unit/test_openstack_rule_service.py
similarity index 100%
rename from tests/test_openstack_rule_service.py
rename to tests/unit/test_openstack_rule_service.py
diff --git a/tests/test_rule_comparator.py b/tests/unit/test_rule_comparator.py
similarity index 100%
rename from tests/test_rule_comparator.py
rename to tests/unit/test_rule_comparator.py
diff --git a/tests/test_rule_refresher.py b/tests/unit/test_rule_refresher.py
similarity index 99%
rename from tests/test_rule_refresher.py
rename to tests/unit/test_rule_refresher.py
index 04db6c1..4513a39 100644
--- a/tests/test_rule_refresher.py
+++ b/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