updated test suite to point to controller project

Author: Matthew Fisher

.coveragerc

@@ -3,20 +3,20 @@ omit =
     */venv/*
     */virtualenv/*
     *tests*
-    api/__init__.py
-    api/docker.py
+    controller/api/__init__.py
+    controller/api/docker.py
     client/__init__.py
     client/models.py
-    cm/__init__.py
-    cm/models.py
-    provider/digitalocean.py
-    provider/ec2.py
-    provider/models.py
-    provider/rackspace.py
-    provider/static.py
-    web/__init__.py
-    web/models.py
-    web/templatetags/__init__.py
+    controller/cm/__init__.py
+    controller/cm/models.py
+    controller/provider/digitalocean.py
+    controller/provider/ec2.py
+    controller/provider/models.py
+    controller/provider/rackspace.py
+    controller/provider/static.py
+    controller/web/__init__.py
+    controller/web/models.py
+    controller/web/templatetags/__init__.py
     # osx library files when not running in virtualenv
     /Library/*
     /System/*
@@ -34,5 +34,5 @@ exclude_lines =
     if __name__ == .__main__.:
 
 [html]
-extra_css = web/static/css/main.css
+extra_css = controller/web/static/css/main.css
 title = Deis Coverage Report

.travis.yml

@@ -18,13 +18,13 @@ before_install:
   - sudo apt-get install -qq libpq-dev
 
 install:
-  - pip install -r requirements.txt
-  - pip install -r dev_requirements.txt coveralls
+  - pip install -r controller/requirements.txt
+  - pip install -r controller/dev_requirements.txt coveralls
 
 before_script:
   - "psql -c 'create database deis_testing;' -U postgres"
   - |
-    cat > deis/local_settings.py <<EOF
+    cat > controller/deis/local_settings.py <<EOF
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql_psycopg2',

Makefile

@@ -1,15 +1,15 @@
 runserver:
-	python manage.py runserver
+	cd controller && python manage.py runserver
 
 db:
-	python manage.py syncdb --migrate --noinput
+	cd controller && python manage.py syncdb --migrate --noinput
 
 test:
-	python manage.py test --noinput api cm provider web
+	cd controller && python manage.py test --noinput api cm provider web
 
 coverage:
-	coverage run manage.py test --noinput api cm provider web
-	coverage html
+	cd controller && coverage run manage.py test --noinput api cm provider web
+	cd controller && coverage html
 
 test_client:
 	python -m unittest discover client.tests