Merge lp:~tvansteenburgh/charms/precise/block-storage-broker/fix-tests into lp:charms/block-storage-broker

[Tim Van Steenburgh]

Fix tests.

[Charles Butler (lazypower)]

This doesn't fix the tests.

test_hooks
  py ... [ERROR]
test_util
  py ... [ERROR]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 586, in loadByNames
    things.append(self.findByName(name))
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 395, in findByName
    return filenameToModule(name)
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 87, in filenameToModule
    return _importFromFile(fn)
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 106, in _importFromFile
    module = imp.load_source(moduleName, fn, fd)
  File "test_hooks.py", line 4, in <module>
    import mocker
exceptions.ImportError: No module named mocker

test_hooks.py
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 586, in loadByNames
    things.append(self.findByName(name))
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 395, in findByName
    return filenameToModule(name)
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 87, in filenameToModule
    return _importFromFile(fn)
  File "/home/charles/tmp/charms/precise/block-storage-broker/.venv/local/lib/python2.7/site-packages/twisted/trial/runner.py", line 106, in _importFromFile
    module = imp.load_source(moduleName, fn, fd)
  File "test_util.py", line 3, in <module>
    import mocker
exceptions.ImportError: No module named mocker

test_util.py
-------------------------------------------------------------------------------
Ran 2 tests in 0.002s

FAILED (errors=2)

review: Needs Fixing

[Antonio Rosales (arosales)]

Tim,

Thanks for your contribution to ensure the block-storage-broker charm is of high quality by working to fix the charm tests.

I am also seeing what Chuck reported in his review:
http://paste.ubuntu.com/8368201/

-thanks,
Antonio

review: Needs Fixing

[Charles Butler (lazypower)]

Tim,

Hi5, great success. Tests pass.

Thanks for this contribution.

+1 LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-03-21 17:05:09 +0000
+++ Makefile	2014-09-10 18:09:00 +0000
@@ -2,10 +2,17 @@
 CHARM_DIR=`pwd`
 
 clean:
+	rm -rf .venv
 	find . -name *.pyc | xargs -r rm
 	find . -name _trial_temp | xargs -r rm -r
-test:
-	cd hooks; trial -j3 test_*py
+
+test: .venv
+	cd hooks; ../.venv/bin/trial -j3 test_*py
+
+.venv:
+	sudo apt-get install python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I boto twisted pyyaml
 
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks