tests/ -> unit_tests/

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

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
 

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
 

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