ressurect testgres tests

Author: kelvich

tests_testgres/mm_cluster.py

@@ -5,12 +5,14 @@
 #
 # Execute this file in order to run 3-node mm cluster
 
+import time
 
 from testgres import PostgresNode, NodeStatus, NodeBackup
 from testgres import reserve_port, release_port
-from testgres import default_username
-from testgres import DEFAULT_XLOG_METHOD
+from testgres.defaults import default_username
+from testgres.enums import XLogMethod
 
+DEFAULT_XLOG_METHOD = XLogMethod.fetch
 
 # track important changes
 __version__ = 0.1
@@ -127,6 +129,11 @@ def reload(self):
 
         return self
 
+    def print_conninfo(self):
+        print(self._build_mm_conn_strings(self.ports,
+                                            self.dbname,
+                                            self.username))
+
     def install(self):
         self.node_any().poll_query_until(dbname=self.dbname,
                                          username=self.username,
@@ -189,6 +196,19 @@ def execute_any(self, dbname, query, username=None, commit=False):
                                        query=query,
                                        commit=commit)
 
+    def await_online(self, node_ids):
+        # await for heartbeat timeout
+        time.sleep(5)
+
+        for node_id in node_ids:
+            self.nodes[node_id].poll_query_until(dbname=self.dbname,
+                                    username=self.username,
+                                    query="select true",
+                                    raise_programming_error=False,
+                                    raise_internal_error=False,
+                                    expected=True)
+        return self
+
     def node_any(self, status=NodeStatus.Running):
         for node in self.nodes:
             if node.status():
@@ -244,9 +264,7 @@ def __init__(self,
 
         super(ClusterNode, self).__init__(name=name,
                                           port=pg_port,
-                                          base_dir=base_dir,
-                                          use_logging=use_logging,
-                                          master=master)
+                                          base_dir=base_dir)
 
         self.mm_port = mm_port
 

tests_testgres/run_tests.sh

@@ -1,7 +1,19 @@
-#!/usr/bin/bash
+#!/bin/sh
+set -e
+ulimit -c unlimited
+
+CURPATH=`pwd`
+BASEDIR=$CURPATH/../../..
+export PATH=$BASEDIR/tmp_install/usr/local/pgsql/bin/:$PATH
+export DYLD_LIBRARY_PATH=$BASEDIR/tmp_install/usr/local/pgsql/lib/:$DYLD_LIBRARY_PATH
+export DESTDIR=$BASEDIR/tmp_install
+
+make -C $BASEDIR install
+make -C $BASEDIR/contrib/mmts install
 
 if [ -z "$VIRTUAL_ENV" ]; then
 	>&2 echo WARNING: not in virtualenv
 fi
 
-python -m unittest discover --pattern=*.py
+# python3 -m unittest discover --pattern=*.py
+python3 ddl.py

tests_testgres/test_failover.py

@@ -11,7 +11,6 @@
         node_id += 1
 
         print("Node #{}".format(node_id))
-        print("\t-> pid: {}".format(node.get_pid()))
         print("\t-> port: {}".format(node.port))
         print("\t-> arbiter port: {}".format(node.mm_port))
         print("\t-> dir: {}".format(node.base_dir))