Merge lp:~tvansteenburgh/charms/precise/cinder-vmware/fix-proof into lp:charms/cinder-vmware

[Tim Van Steenburgh]

Fix proof.

[Charles Butler (lazypower)]

+1 LGTM

[lp:~tvansteenburgh/charms/precise/cinder-vmware/fix-proof]

13. By Tim Van Steenburgh on 2014-09-11

Fix tests

Unmerged revisions

13. By Tim Van Steenburgh on 2014-09-11

Fix tests

12. By Tim Van Steenburgh on 2014-09-10

Fix proof

=== modified file 'Makefile'
--- Makefile	2014-06-16 10:58:10 +0000
+++ Makefile	2014-09-11 14:23:41 +0000
@@ -6,9 +6,14 @@
 	@flake8 --exclude hooks/charmhelpers unit_tests
 	@charm proof
 
-test:
+test: .venv
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture -v unit_tests
+	.venv/bin/nosetests --nologcapture -v unit_tests
+
+.venv:
+	sudo apt-get install python-virtualenv
+	virtualenv .venv
+	.venv/bin/pip install nose mock pyyaml
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
@@ -21,3 +26,6 @@
 publish: test lint
 	bzr push lp:charms/cinder-vmware
 	bzr push lp:charms/trusty/cinder-vmware
+
+clean:
+	rm -rf .venv

=== modified file 'config.yaml'
--- config.yaml	2014-06-16 11:01:16 +0000
+++ config.yaml	2014-09-11 14:23:41 +0000
@@ -1,12 +1,15 @@
 options:
   host-username:
     type: string
+    default:
     description: Username for authenticating with VMware VC server.
   host-password:
     type: string
+    default:
     description: Password for authenticating with VMware VC server.
   host-ip:
     type: string
+    default:
     description: IP address for connecting to VMware VC server.
   volume-folder:
     type: string