fix tests

Author: funbringer

testgres/testgres.py

@@ -484,7 +484,7 @@ def init(self, allow_streaming=False, fsync=False, initdb_params=[]):
 
             if allow_streaming:
                 cur_ver = LooseVersion(get_pg_config()["VERSION_NUM"])
-                min_ver = LooseVersion('9.6.0')
+                min_ver = LooseVersion('9.6')
 
                 # select a proper wal_level for PostgreSQL
                 wal_level = "hot_standby" if cur_ver < min_ver else "replica"
@@ -907,7 +907,7 @@ def catchup(self):
         master = self.master
 
         cur_ver = LooseVersion(get_pg_config()["VERSION_NUM"])
-        min_ver = LooseVersion('10.0')
+        min_ver = LooseVersion('10')
 
         if cur_ver >= min_ver:
             poll_lsn = "select pg_current_wal_lsn()::text"
@@ -1119,7 +1119,8 @@ def get_pg_config():
 
         # Fetch version of PostgreSQL and save it as VERSION_NUM
         version_parts = pg_config_data["VERSION"].split(" ")
-        pg_config_data["VERSION_NUM"] = version_parts[-1]
+        version, _, _ = version_parts[-1].partition('beta')
+        pg_config_data["VERSION_NUM"] = version
 
     return pg_config_data
 

tests/test_simple.py

@@ -7,11 +7,9 @@
 import logging.config
 import subprocess
 
-from distutils.version import LooseVersion
-
 from testgres import InitNodeException, \
     StartNodeException, ExecUtilException, \
-    BackupException, QueryException
+    BackupException, QueryException, CatchUpException
 
 from testgres import get_new_node, get_pg_config
 from testgres import bound_ports
@@ -28,8 +26,6 @@ def test_double_init(self):
                 node.init()
             except InitNodeException as e:
                 got_exception = True
-            except Exception as e:
-                pass
 
         self.assertTrue(got_exception)
 
@@ -41,8 +37,6 @@ def test_uninitialized_start(self):
                 node.start()
             except StartNodeException as e:
                 got_exception = True
-            except Exception as e:
-                pass
 
         self.assertTrue(got_exception)
 
@@ -145,21 +139,17 @@ def test_control_data(self):
                 node.get_control_data()
             except ExecUtilException as e:
                 got_exception = True
-            except Exception as e:
-                pass
             self.assertTrue(got_exception)
 
             got_exception = False
 
             try:
                 node.init()
                 data = node.get_control_data()
-                self.assertIsNotNode(data)
+                self.assertIsNotNone(data)
             except ExecUtilException as e:
                 print(e.message)
                 got_exception = True
-            except Exception as e:
-                pass
             self.assertFalse(got_exception)
 
     def test_backup_simple(self):
@@ -257,8 +247,8 @@ def test_incorrect_catchup(self):
             got_exception = False
             try:
                 node.catchup()
-            except Exception as e:
-                pass
+            except CatchUpException as e:
+                got_exception = True
             self.assertTrue(got_exception)
 
     def test_dump(self):