Update travis tests

knizhnik · knizhnik · commit 6059981ad474 · 2016-08-05T19:24:18.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -396,7 +396,7 @@ static int MtmConnectSocket(int node, int port, int timeout)
     unsigned i, n_addrs = sizeof(addrs) / sizeof(addrs[0]);
 	MtmHandshakeMessage req;
 	MtmArbiterMessage   resp;
-	int rc, sd;
+	int sd;
 	timestamp_t start = MtmGetSystemTime();
 	char const* host = Mtm->nodes[node].con.hostName;
 
@@ -476,10 +476,7 @@ static int MtmConnectSocket(int node, int port, int timeout)
 		close(sd);
 		goto Retry;
 	}
-	while ((rc = MtmWaitSocket(sd, false, MtmHeartbeatSendTimeout)) == 0) { 
-		elog(WARNING, "Arbiter waiting response for handshake message from %s:%d: rc=%d, error=%d", host, port, rc, errno);	
-	}
-	if (rc != 1 || MtmReadSocket(sd, &resp, sizeof resp) != sizeof(resp)) { 
+	if (MtmReadSocket(sd, &resp, sizeof resp) != sizeof(resp)) { 
 		elog(WARNING, "Arbiter failed to receive response for handshake message from %s:%d: errno=%d", host, port, errno);
 		close(sd);
 		goto Retry;
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -15,7 +15,7 @@
 
 my $psql_out;
 # XXX: create extension on start and poll_untill status is Online
-sleep(5);
+sleep(10);
 
 ###############################################################################
 # Replication check
@@ -60,7 +60,7 @@
 diag("starting node 2");
 $cluster->{nodes}->[2]->start;
 #diag("sleeping 10");
-#sleep(10); # XXX: here we can poll
+sleep(10); # XXX: here we can poll
 
 $cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
 
