Replace Test::More plans with done_testing

Rather than doing manual book keeping to plan the number of tests to run
in each TAP suite, conclude each run with done_testing() summing up the
the number of tests that ran. This removes the need for maintaning and
updating the plan count at the expense of an accurate count of remaining
during the test suite runtime.

This patch has been discussed a number of times, often in the context of
other patches which updates tests, so a larger number of discussions can
be found in the archives.

Reviewed-by: Julien Rouhaud <[email protected]>
Reviewed-by: Dagfinn Ilmari Mannsåker <[email protected]>
Reviewed-by: Tom Lane <[email protected]>
Reviewed-by: Michael Paquier <[email protected]>
Reviewed-by: Kyotaro Horiguchi <[email protected]>
Discussion: https://postgr.es/m/[email protected]

Author: danielgustafsson

contrib/amcheck/t/001_verify_heapam.pl

@@ -8,7 +8,7 @@
 use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
-use Test::More tests => 272;
+use Test::More;
 
 my ($node, $result);
 
@@ -283,3 +283,5 @@ sub check_all_options_uncorrupted
 		}
 	}
 }
+
+done_testing();

contrib/amcheck/t/002_cic.pl

@@ -9,7 +9,7 @@
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
 
-use Test::More tests => 3;
+use Test::More;
 
 my ($node, $result);
 

contrib/amcheck/t/003_cic_2pc.pl

@@ -9,7 +9,7 @@
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
 
-use Test::More tests => 5;
+use Test::More;
 
 Test::More->builder->todo_start('filesystem bug')
   if PostgreSQL::Test::Utils::has_wal_read_bug;

contrib/auto_explain/t/001_auto_explain.pl

@@ -6,7 +6,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 4;
+use Test::More;
 
 my $node = PostgreSQL::Test::Cluster->new('main');
 $node->init;
@@ -53,3 +53,5 @@
 	$log_contents,
 	qr/"Node Type": "Index Scan"[^}]*"Index Name": "pg_class_relname_nsp_index"/s,
 	"index scan logged, json mode");
+
+done_testing();

contrib/bloom/t/001_wal.pl

@@ -6,7 +6,7 @@
 use warnings;
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 31;
+use Test::More;
 
 my $node_primary;
 my $node_standby;
@@ -80,3 +80,5 @@ sub test_index_replay
 	);
 	test_index_replay("insert $i");
 }
+
+done_testing();

contrib/oid2name/t/001_basic.pl

@@ -5,11 +5,13 @@
 use warnings;
 
 use PostgreSQL::Test::Utils;
-use Test::More tests => 8;
+use Test::More;
 
 #########################################
 # Basic checks
 
 program_help_ok('oid2name');
 program_version_ok('oid2name');
 program_options_handling_ok('oid2name');
+
+done_testing();

contrib/test_decoding/t/001_repl_stats.pl

@@ -8,7 +8,7 @@
 use File::Path qw(rmtree);
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 2;
+use Test::More;
 
 # Test set-up
 my $node = PostgreSQL::Test::Cluster->new('test');
@@ -118,3 +118,5 @@ sub test_slot_stats
 
 # shutdown
 $node->stop;
+
+done_testing();

contrib/vacuumlo/t/001_basic.pl

@@ -5,8 +5,10 @@
 use warnings;
 
 use PostgreSQL::Test::Utils;
-use Test::More tests => 8;
+use Test::More;
 
 program_help_ok('vacuumlo');
 program_version_ok('vacuumlo');
 program_options_handling_ok('vacuumlo');
+
+done_testing();

src/bin/initdb/t/001_initdb.pl

@@ -11,7 +11,7 @@
 use File::stat qw{lstat};
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 22;
+use Test::More;
 
 my $tempdir = PostgreSQL::Test::Utils::tempdir;
 my $xlogdir = "$tempdir/pgxlog";
@@ -92,3 +92,5 @@
 	ok(check_mode_recursive($datadir_group, 0750, 0640),
 		'check PGDATA permissions');
 }
+
+done_testing();

src/bin/pg_amcheck/t/001_basic.pl

@@ -5,8 +5,10 @@
 use warnings;
 
 use PostgreSQL::Test::Utils;
-use Test::More tests => 8;
+use Test::More;
 
 program_help_ok('pg_amcheck');
 program_version_ok('pg_amcheck');
 program_options_handling_ok('pg_amcheck');
+
+done_testing();

src/bin/pg_amcheck/t/002_nonesuch.pl

@@ -6,7 +6,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 76;
+use Test::More;
 
 # Test set-up
 my ($node, $port);
@@ -268,3 +268,5 @@
 		qr/pg_amcheck: error: no relations to check/
 	],
 	'schema exclusion pattern overrides all inclusion patterns');
+
+done_testing();

src/bin/pg_amcheck/t/003_check.pl

@@ -8,7 +8,7 @@
 use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
-use Test::More tests => 63;
+use Test::More;
 
 my ($node, $port, %corrupt_page, %remove_relation);
 
@@ -517,3 +517,5 @@ ()
 	[ @cmd, '-d', 'db1', '-d', 'db2', '-d', 'db3', '-S', 's*' ],
 	0, [$no_output_re], [$no_output_re],
 	'pg_amcheck excluding all corrupt schemas');
+
+done_testing();

src/bin/pg_amcheck/t/004_verify_heapam.pl

@@ -297,7 +297,6 @@ sub write_tuple
 $node->start;
 
 # Ok, Xids and page layout look ok.  We can run corruption tests.
-plan tests => 19;
 
 # Check that pg_amcheck runs against the uncorrupted table without error.
 $node->command_ok(
@@ -528,3 +527,5 @@ sub header
 
 $node->teardown_node;
 $node->clean_node;
+
+done_testing();

src/bin/pg_amcheck/t/005_opclass_damage.pl

@@ -8,7 +8,7 @@
 use warnings;
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 5;
+use Test::More;
 
 my $node = PostgreSQL::Test::Cluster->new('test');
 $node->init;
@@ -57,3 +57,5 @@
 	[],
 	'pg_amcheck all schemas, tables and indexes reports fickleidx corruption'
 );
+
+done_testing();

src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl

@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 42;
+use Test::More;
 
 program_help_ok('pg_archivecleanup');
 program_version_ok('pg_archivecleanup');
@@ -101,3 +101,5 @@ sub run_check
 run_check('',                 'pg_archivecleanup');
 run_check('.partial',         'pg_archivecleanup with .partial file');
 run_check('.00000020.backup', 'pg_archivecleanup with .backup file');
+
+done_testing();

src/bin/pg_basebackup/t/020_pg_receivewal.pl

@@ -5,7 +5,7 @@
 use warnings;
 use PostgreSQL::Test::Utils;
 use PostgreSQL::Test::Cluster;
-use Test::More tests => 42;
+use Test::More;
 
 program_help_ok('pg_receivewal');
 program_version_ok('pg_receivewal');
@@ -334,3 +334,5 @@
 	"WAL segment $walfile_after_promotion archived after timeline jump");
 ok(-e "$timeline_dir/00000002.history",
 	"timeline history file archived after timeline jump");
+
+done_testing();

src/bin/pg_basebackup/t/030_pg_recvlogical.pl

@@ -5,7 +5,7 @@
 use warnings;
 use PostgreSQL::Test::Utils;
 use PostgreSQL::Test::Cluster;
-use Test::More tests => 20;
+use Test::More;
 
 program_help_ok('pg_recvlogical');
 program_version_ok('pg_recvlogical');
@@ -106,3 +106,5 @@
 		'--start', '--endpos', "$nextlsn", '--no-loop', '-f', '-'
 	],
 	'replayed a two-phase transaction');
+
+done_testing();

src/bin/pg_checksums/t/001_basic.pl

@@ -4,8 +4,10 @@
 use strict;
 use warnings;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 8;
+use Test::More;
 
 program_help_ok('pg_checksums');
 program_version_ok('pg_checksums');
 program_options_handling_ok('pg_checksums');
+
+done_testing();

src/bin/pg_checksums/t/002_actions.pl

@@ -11,7 +11,7 @@
 use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
-use Test::More tests => 66;
+use Test::More;
 
 
 # Utility routine to create and check a table with corrupted checksums
@@ -257,3 +257,5 @@ sub fail_corrupt
 fail_corrupt($node, "99990_init.123");
 fail_corrupt($node, "99990_fsm.123");
 fail_corrupt($node, "99990_vm.123");
+
+done_testing();

src/bin/pg_config/t/001_pg_config.pl

@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 20;
+use Test::More;
 
 program_help_ok('pg_config');
 program_version_ok('pg_config');
@@ -17,3 +17,5 @@
 	qr/lib.*\n.*bin/, 'pg_config two options different order');
 command_like(['pg_config'], qr/.*\n.*\n.*/,
 	'pg_config without options prints many lines');
+
+done_testing();

src/bin/pg_controldata/t/001_pg_controldata.pl

@@ -5,7 +5,7 @@
 use warnings;
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 17;
+use Test::More;
 
 program_help_ok('pg_controldata');
 program_version_ok('pg_controldata');
@@ -42,3 +42,5 @@
 	],
 	[qr/^$/],
 	'pg_controldata with corrupted pg_control');
+
+done_testing();

src/bin/pg_ctl/t/001_start_stop.pl

@@ -9,7 +9,7 @@
 use File::stat qw{lstat};
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 24;
+use Test::More;
 
 my $tempdir       = PostgreSQL::Test::Utils::tempdir;
 my $tempdir_short = PostgreSQL::Test::Utils::tempdir_short;
@@ -111,3 +111,5 @@
 	'pg_ctl restart with server running');
 
 system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/data";
+
+done_testing();

src/bin/pg_ctl/t/002_status.pl

@@ -6,7 +6,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 3;
+use Test::More;
 
 my $tempdir       = PostgreSQL::Test::Utils::tempdir;
 
@@ -25,3 +25,5 @@
 	0, 'pg_ctl status with server running');
 
 system_or_bail 'pg_ctl', 'stop', '-D', $node->data_dir;
+
+done_testing();

src/bin/pg_ctl/t/003_promote.pl

@@ -6,7 +6,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 12;
+use Test::More;
 
 my $tempdir = PostgreSQL::Test::Utils::tempdir;
 
@@ -62,3 +62,5 @@
 
 is($node_standby->safe_psql('postgres', 'SELECT pg_is_in_recovery()'),
 	'f', 'promoted standby is not in recovery');
+
+done_testing();

src/bin/pg_ctl/t/004_logrotate.pl

@@ -6,7 +6,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 14;
+use Test::More;
 use Time::HiRes qw(usleep);
 
 # Extract the file name of a $format from the contents of
@@ -136,3 +136,5 @@ sub check_log_pattern
 check_log_pattern('jsonlog', $new_current_logfiles, 'syntax error', $node);
 
 $node->stop();
+
+done_testing();

src/bin/pg_dump/t/001_basic.pl

@@ -7,7 +7,7 @@
 use Config;
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
-use Test::More tests => 82;
+use Test::More;
 
 my $tempdir       = PostgreSQL::Test::Utils::tempdir;
 
@@ -188,3 +188,5 @@
 	qr/\Qpg_dumpall: error: option --exclude-database cannot be used together with -g\/--globals-only\E/,
 	'pg_dumpall: option --exclude-database cannot be used together with -g/--globals-only'
 );
+
+done_testing();