Merge lp:~allenap/postgresfixture/trusty-compatibility into lp:~lazr-developers/postgresfixture/trunk

[Gavin Panella]

Accommodate differences between PostgreSQL's pg_ctl in version 9.1 and >= 9.2.

[Gavin Panella (allenap)]

Selfie.

review: Approve

=== modified file 'postgresfixture/cluster.py'
--- postgresfixture/cluster.py	2014-01-17 16:35:21 +0000
+++ postgresfixture/cluster.py	2014-01-17 17:57:51 +0000
@@ -141,10 +141,19 @@
             try:
                 self.execute("pg_ctl", "status", stdout=null)
             except CalledProcessError as error:
-                if error.returncode == 1:
-                    return False
+                # pg_ctl in PostgreSQL 9.1 returns 1 when the server is
+                # not running, whereas it returns 3 in PostgreSQL 9.2
+                # and later. This checks for specific codes to avoid
+                # masking errors from insufficient permissions or
+                # missing executables, for example.
+                if LooseVersion(self.version) >= LooseVersion("9.2"):
+                    if error.returncode == 3:
+                        return False
                 else:
-                    raise
+                    if error.returncode == 1:
+                        return False
+                # Some other error: moan about it.
+                raise
             else:
                 return True
 
 
=== modified file 'postgresfixture/tests/test_cluster.py'
--- postgresfixture/tests/test_cluster.py	2014-01-17 16:35:21 +0000
+++ postgresfixture/tests/test_cluster.py	2014-01-17 17:57:51 +0000
@@ -13,6 +13,7 @@
 __all__ = []
 
 from contextlib import closing
+from distutils.version import LooseVersion
 from os import (
     getpid,
     path,
@@ -177,7 +178,12 @@
         self.assertEqual(("pg_ctl", "status"), command)
 
     def test_running_not(self):
-        self.patch_check_call(returncode=1)
+        # pg_ctl in PostgreSQL 9.1 returns 1 when the server is not
+        # running, whereas it returns 3 in PostgreSQL 9.2 and later.
+        if LooseVersion(self.version) >= LooseVersion("9.2"):
+            self.patch_check_call(returncode=3)
+        else:
+            self.patch_check_call(returncode=1)
         cluster = self.make(self.make_dir())
         self.assertFalse(cluster.running)