fix TAP tests after merge with -master

Author: kelvich

contrib/mmts/Cluster.pm

@@ -132,7 +132,18 @@ sub stop
 
 	foreach my $node (@$nodes)
 	{
-		$node->stop();
+		$node->stop('fast');
+	}
+}
+
+sub teardown
+{
+	my ($self) = @_;
+	my $nodes = $self->{nodes};
+
+	foreach my $node (@$nodes)
+	{
+		$node->teardown();
 	}
 }
 

contrib/mmts/t/000_deadlock.pl

@@ -92,3 +92,6 @@ sub query_exec_async
 }
 
 query_row($conns[0], "select * from t where k = 1");
+
+$cluster->stop();
+1;

contrib/mmts/t/001_basic_recovery.pl

@@ -80,4 +80,5 @@
 
 is($psql_out, '40', "Check replication after failed node recovery.");
 
-
+$cluster->stop();
+1;

contrib/mmts/t/002_cross.pl

@@ -149,3 +149,6 @@ sub parse_state
 }
 
 is($anomalies, 0, "no cross anomalies after $selects selects");
+
+$cluster->stop();
+1;

contrib/mmts/t/003_pgbench.pl

@@ -109,3 +109,6 @@ sub writer
 
 ($rc, $out, $err) = $cluster->psql(0, 'postgres', "select count(*) from reader_log where v = 0;");
 isnt($out, 0, "there are some zeros in reader_log");
+
+$cluster->stop();
+1;

contrib/mmts/tests/writer.pgb

@@ -1,6 +1,6 @@
-\setrandom src 0 999
-\setrandom dst 0 999
-\setrandom amount 1 10
+\set src random(0, 999)
+\set dst random(0, 999)
+\set amount random(1, 10)
 begin;
 update t set v = v - :amount where k=:src;
 update t set v = v + :amount where k=:dst;