Check that node 2 stops in tap-test 001. Make Cluster remove the node's pidfile when stopping one.

kvap · kvap · commit 2ae80f10a3e4 · 2016-08-16T17:32:31.000+03:00
diff --git a/contrib/mmts/Cluster.pm b/contrib/mmts/Cluster.pm
@@ -142,6 +142,9 @@ sub stopnode
 
 	my $pgdata = $node->data_dir;
 	my $ret = TestLib::system_log('pg_ctl', '-D', $pgdata, '-m', 'fast', 'stop');
+	my $pidfile = $node->data_dir . "/postmaster.pid";
+	diag("unlink $pidfile");
+	unlink $pidfile;
 	$node->{_pid} = undef;
 	$node->_update_pid;
 
@@ -153,6 +156,12 @@ sub stopnode
 	return 1;
 }
 
+sub stopid
+{
+	my ($self, $idx, $mode) = @_;
+	return stopnode($self->{nodes}->[$idx]);
+}
+
 sub killtree
 {
 	my $root = shift;
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -2,7 +2,7 @@
 use warnings;
 use Cluster;
 use TestLib;
-use Test::More tests => 8;
+use Test::More tests => 9;
 
 my $cluster = new Cluster(3);
 $cluster->init();
@@ -39,7 +39,15 @@
 ###############################################################################
 
 diag("stopping node 2");
-$cluster->{nodes}->[2]->teardown_node;
+if ($cluster->stopid(2, 'immediate')) {
+	pass("node 2 stops");
+} else {
+	fail("node 2 stops");
+	if (!$cluster->stopid(2, 'kill')) {
+		my $name = $cluster->{nodes}->[2]->name;
+		BAIL_OUT("failed to kill $name");
+	}
+}
 
 sleep(5); # Wait until failure of node will be detected
 
