Merge lp:~canonical-losas/charms/trusty/squid-reverseproxy/venv-testing into lp:charms/trusty/squid-reverseproxy

[Paul Collins]

Address bug#1401323 by creating the virtualenv using --system-site-packages so that apt_pkg can be accessed.

[lp:~canonical-losas/charms/trusty/squid-reverseproxy/venv-testing]

51. By Paul Collins on 2015-02-23

merge from trusty, resolving hooks/hooks.py conflict

Unmerged revisions

=== modified file 'Makefile'
--- Makefile	2014-10-31 15:05:23 +0000
+++ Makefile	2015-02-23 02:11:13 +0000
@@ -21,7 +21,7 @@
 	@(charm proof $(PWD) || [ $$? -eq 100 ]) && echo OK
 	@test `cat revision` = 0 && rm revision
 
-test:
+test: .venv
 	@echo Starting tests...
 	@pip install nose testtools mock pyyaml
 	@CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) nosetests -s $(TEST_DIR)
@@ -41,4 +41,13 @@
 		-d hooks/charmhelpers
 	@echo Do not forget to commit the updated files if any.
 
+.venv:
+	sudo apt-get install -y python-pip python-coverage python-nose python-testtools \
+		python-mock make bzr python-virtualenv
+	virtualenv .venv --system-site-packages
+ 
+clean:
+	rm -rf .venv
+
+
 .PHONY: revision proof test lint sourcedeps charm-payload

=== modified file 'hooks/install'
--- hooks/install	2013-10-10 22:50:35 +0000
+++ hooks/install	2015-02-23 02:11:13 +0000
@@ -3,7 +3,7 @@
 set -eu
 
 juju-log 'Invoking charm-pre-install hooks'
-[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
+[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done ) || true
 
 juju-log 'Invoking python-based install hook'
 python hooks/hooks.py install