Merge lp:~tvansteenburgh/charms/precise/apache2/fix-tests into lp:charms/apache2

[Tim Van Steenburgh]

Fix test/lint errors.

[Matt Bruzek (mbruzek)]

Hey Tim,

These changes to the Makefile look great! The bundletests pass now. Thanks.

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-10-10 22:47:57 +0000
+++ Makefile	2014-09-10 17:35:54 +0000
@@ -17,9 +17,9 @@
 	@(charm proof $(PWD) || [ $$? -eq 100 ]) && echo OK
 	@test `cat revision` = 0 && rm revision
 
-test:
+test: .venv
 	@echo Starting tests...
-	@CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) nosetests $(TEST_DIR)
+	@CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) .venv/bin/nosetests $(TEST_DIR)
 
 lint:
 	@echo Checking for Python syntax...
@@ -36,4 +36,12 @@
 		-d hooks/charmhelpers
 	@echo Do not forget to commit the updated files if any.
 
+.venv:
+	sudo apt-get install python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose testtools mock pyyaml
+
+clean:
+	rm -rf .venv
+
 .PHONY: revision proof test lint sourcedeps charm-payload

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-06-28 19:26:04 +0000
+++ hooks/hooks.py	2014-09-10 17:35:54 +0000
@@ -68,9 +68,9 @@
         dpkg.communicate(input=selections)
 
 
-#------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # apt_get_purge( package ):  Purges a package
-#------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 def apt_get_purge(packages=None):
     if packages is None:
         return False
@@ -79,10 +79,10 @@
     return subprocess.call(cmd_line)
 
 
-#------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # service_apache2:  Convenience function to start/stop/restart/reload
 #                   the apache2 service
-#------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 def service_apache2(action=None):
     if action is None:
         return

=== modified file 'hooks/tests/test_nrpe_hooks.py'
--- hooks/tests/test_nrpe_hooks.py	2013-10-10 22:47:57 +0000
+++ hooks/tests/test_nrpe_hooks.py	2014-09-10 17:35:54 +0000
@@ -44,7 +44,7 @@
             patcher = patch.object(data['object'], attr, create=create)
             self.patched[attr] = patcher.start()
             self.addCleanup(patcher.stop)
-        if not 'JUJU_UNIT_NAME' in os.environ:
+        if 'JUJU_UNIT_NAME' not in os.environ:
             os.environ['JUJU_UNIT_NAME'] = 'test'
 
     def check_call_counts(self, **kwargs):