From a6508d24e6d6c8d97e0f4200ebf850c3d4fe213b Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Thu, 1 Aug 2013 16:23:29 -0700
Subject: [PATCH] tests/ -> unit_tests/

---
 Makefile                                             | 4 ++--
 {tests => unit_tests}/__init__.py                    | 0
 {tests => unit_tests}/test_nova_compute_contexts.py  | 2 +-
 {tests => unit_tests}/test_nova_compute_relations.py | 2 +-
 {tests => unit_tests}/test_nova_compute_utils.py     | 2 +-
 {tests => unit_tests}/test_utils.py                  | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {tests => unit_tests}/__init__.py (100%)
 rename {tests => unit_tests}/test_nova_compute_contexts.py (99%)
 rename {tests => unit_tests}/test_nova_compute_relations.py (99%)
 rename {tests => unit_tests}/test_nova_compute_utils.py (99%)
 rename {tests => unit_tests}/test_utils.py (100%)

diff --git a/Makefile b/Makefile
index acc7d5e6..2e2b2db6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,12 @@ PYTHON := /usr/bin/env python
 
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks
-	@flake8 --exclude hooks/charmhelpers tests
+	@flake8 --exclude hooks/charmhelpers unit_tests
 	@charm proof
 
 test:
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  tests
+	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
 
 sync:
 	@charm-helper-sync -c charm-helpers-sync.yaml
diff --git a/tests/__init__.py b/unit_tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to unit_tests/__init__.py
diff --git a/tests/test_nova_compute_contexts.py b/unit_tests/test_nova_compute_contexts.py
similarity index 99%
rename from tests/test_nova_compute_contexts.py
rename to unit_tests/test_nova_compute_contexts.py
index 6a516ecd..ec11003c 100644
--- a/tests/test_nova_compute_contexts.py
+++ b/unit_tests/test_nova_compute_contexts.py
@@ -1,6 +1,6 @@
 from mock import MagicMock
 from copy import deepcopy
-from tests.test_utils import CharmTestCase
+from unit_tests.test_utils import CharmTestCase
 
 import hooks.nova_compute_context as context
 
diff --git a/tests/test_nova_compute_relations.py b/unit_tests/test_nova_compute_relations.py
similarity index 99%
rename from tests/test_nova_compute_relations.py
rename to unit_tests/test_nova_compute_relations.py
index b7b325cd..eda966f1 100644
--- a/tests/test_nova_compute_relations.py
+++ b/unit_tests/test_nova_compute_relations.py
@@ -1,6 +1,6 @@
 from mock import call, patch, MagicMock
 
-from tests.test_utils import CharmTestCase
+from unit_tests.test_utils import CharmTestCase
 
 import hooks.nova_compute_utils as utils
 
diff --git a/tests/test_nova_compute_utils.py b/unit_tests/test_nova_compute_utils.py
similarity index 99%
rename from tests/test_nova_compute_utils.py
rename to unit_tests/test_nova_compute_utils.py
index c2bfbab7..ac79ba06 100644
--- a/tests/test_nova_compute_utils.py
+++ b/unit_tests/test_nova_compute_utils.py
@@ -1,6 +1,6 @@
 from mock import patch, MagicMock, call
 
-from tests.test_utils import CharmTestCase, patch_open
+from unit_tests.test_utils import CharmTestCase, patch_open
 
 
 import hooks.nova_compute_utils as utils
diff --git a/tests/test_utils.py b/unit_tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to unit_tests/test_utils.py