Merge lp:~stub/charms/precise/postgresql/tests into lp:charms/postgresql

[Stuart Bishop]

Allow running of tests in different series, both precise and trusty.

Work around the issue where SSH subprocesses launched by 'juju ssh' are not being reaped.

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-06-10 11:44:03 +0000
+++ Makefile	2014-06-10 11:44:04 +0000
@@ -1,5 +1,6 @@
 CHARM_DIR := $(shell pwd)
 TEST_TIMEOUT := 900
+SERIES := $(juju get-environment default-series)
 
 default:
 	@echo "One of:"
@@ -19,25 +20,23 @@
 	cd hooks && trial test_hooks.py
 
 integration_test:
-	@echo "PostgreSQL integration tests, all non-beta versions"
-	@make integration_test_91
-	@make integration_test_92
-	@make integration_test_93
+	@echo "PostgreSQL integration tests, all non-beta versions, ${SERIES}"
+	trial test.PG91Tests test.PG92Tests test.PG93Tests
 
 integration_test_91:
-	@echo "PostgreSQL 9.1 integration tests"
+	@echo "PostgreSQL 9.1 integration tests, ${SERIES}"
 	trial test.PG91Tests
 
 integration_test_92:
-	@echo "PostgreSQL 9.2 integration tests"
+	@echo "PostgreSQL 9.2 integration tests, ${SERIES}"
 	trial test.PG92Tests
 
 integration_test_93:
-	@echo "PostgreSQL 9.3 integration tests"
+	@echo "PostgreSQL 9.3 integration tests, ${SERIES}"
 	trial test.PG93Tests
 
 integration_test_94:
-	@echo "PostgreSQL 9.4 (beta) integration tests"
+	@echo "PostgreSQL 9.4 (beta) integration tests, ${SERIES}"
 	trial test.PG94Tests
 
 lint:

=== modified file 'test.py'
--- test.py	2014-06-10 11:44:03 +0000
+++ test.py	2014-06-10 11:44:04 +0000
@@ -10,6 +10,7 @@
 """
 
 import os.path
+import signal
 import socket
 import subprocess
 import time
@@ -23,9 +24,9 @@
 from testing.jujufixture import JujuFixture, run
 
 
-SERIES = 'precise'
-TEST_CHARM = 'local:postgresql'
-PSQL_CHARM = 'cs:postgresql-psql'
+SERIES = os.environ.get('SERIES', 'precise').strip()
+TEST_CHARM = 'local:{}/postgresql'.format(SERIES)
+PSQL_CHARM = 'local:{}/postgresql-psql'.format(SERIES)
 
 
 class NotReady(Exception):
@@ -55,7 +56,7 @@
         self.pg_config = dict(version=self.VERSION, pgdg=self.PGDG)
 
         self.juju = self.useFixture(JujuFixture(
-            reuse_machines=True,
+            series=SERIES, reuse_machines=True,
             do_teardown='TEST_DONT_TEARDOWN_JUJU' not in os.environ))
 
         # If the charms fail, we don't want tests to hang indefinitely.
@@ -287,14 +288,15 @@
         local_port = s.getsockname()[1]
         s.close()
 
-        # Open the tunnel and wait for it to come up. The new process
-        # group is to ensure we can reap all the ssh tunnels, as simply
-        # killing the 'juju ssh' process doesn't seem to be enough.
+        # Open the tunnel and wait for it to come up.
+        # The new process group is to ensure we can reap all the ssh
+        # tunnels, as simply killing the 'juju ssh' process doesn't seem
+        # to be enough.
         tunnel_cmd = [
             'juju', 'ssh', psql_unit, '-N', '-L',
             '{}:{}:{}'.format(local_port, rel_info['host'], rel_info['port'])]
         tunnel_proc = subprocess.Popen(
-            tunnel_cmd, stdin=subprocess.PIPE)
+            tunnel_cmd, stdin=subprocess.PIPE, preexec_fn=os.setpgrp)
             # Don't disable stdout, so we can see when there are SSH
             # failures like bad host keys.
             #stdout=open('/dev/null', 'ab'), stderr=subprocess.STDOUT)
@@ -330,6 +332,7 @@
             con.close()
             return rv
         finally:
+            os.killpg(tunnel_proc.pid, signal.SIGTERM)
             tunnel_proc.kill()
             tunnel_proc.wait()
 

=== modified file 'testing/jujufixture.py'
--- testing/jujufixture.py	2014-04-04 17:40:36 +0000
+++ testing/jujufixture.py	2014-06-10 11:44:04 +0000
@@ -17,9 +17,11 @@
     Assumes juju environment is bootstrapped.
     """
 
-    def __init__(self, reuse_machines=False, do_teardown=True):
+    def __init__(self, series, reuse_machines=False, do_teardown=True):
         super(JujuFixture, self).__init__()
 
+        self.series = series
+
         self.reuse_machines = reuse_machines
 
         # Optionally, don't teardown services and machines after running
@@ -92,6 +94,7 @@
             int(k) for k, m in self.status['machines'].items()
             if k != '0'
             and m.get('life', None) not in ('dead', 'dying')
+            and m.get('series', None) == self.series
             and m.get('agent-state', 'pending') in ('started', 'ready'))
         for service in self.status.get('services', {}).values():
             for unit in service.get('units', {}).values():