fix test scripts for PostgreSQL 15

Andrei Krichinin · Andrei Krichinin · commit a71db51b8e4d · 2022-10-01T01:25:56.000+05:00
diff --git a/t/000_deadlock.pl b/t/000_deadlock.pl
@@ -4,7 +4,6 @@
 use warnings;
 
 use Cluster;
-use TestLib;
 
 # Test whether we have both DBI and DBD::pg
 my $dbdpg_rc = eval
diff --git a/t/001_regress.pl b/t/001_regress.pl
@@ -34,7 +34,14 @@
 }
 
 # determenistic ports for expected files
-$PostgresNode::last_port_assigned = 55431;
+if ($Cluster::pg_15_modules)
+{
+	$PostgreSQL::Test::Cluster::last_port_assigned = 55431;
+}
+else
+{
+	$PostgresNode::last_port_assigned = 55431;
+}
 
 my $cluster = new Cluster(3);
 $cluster->init(q{
@@ -84,13 +91,28 @@
 
 # load schedule without tablespace test which is not expected
 # to work with several postgreses on a single node
-my $schedule = TestLib::slurp_file('../../src/test/regress/parallel_schedule');
+my $schedule;
+if ($Cluster::pg_15_modules)
+{
+	$schedule = PostgreSQL::Test::Utils::slurp_file('../../src/test/regress/parallel_schedule');
+}
+else
+{
+	$schedule = TestLib::slurp_file('../../src/test/regress/parallel_schedule');
+}
 $schedule =~ s/test: tablespace/#test: tablespace/g;
 $schedule =~ s/test: cfs/#test: cfs/g;
 $schedule =~ s/test: largeobject//; # serial schedule
 $schedule =~ s/largeobject//; # parallel schedule
 unlink('parallel_schedule');
-TestLib::append_to_file('parallel_schedule', $schedule);
+if ($Cluster::pg_15_modules)
+{
+	PostgreSQL::Test::Utils::append_to_file('parallel_schedule', $schedule);
+}
+else
+{
+	TestLib::append_to_file('parallel_schedule', $schedule);
+}
 
 my $regress_shlib = $ENV{REGRESS_SHLIB};
 my $regress_libdir = dirname($regress_shlib);
@@ -99,13 +121,26 @@
 # REMOVEME: not needed in 14+, pg_regress fixed in upstream
 mkdir("${regress_outdir}/sql");
 mkdir("${regress_outdir}/expected");
-TestLib::system_log($ENV{'PG_REGRESS'},
-	'--host=' . $cluster->{nodes}->[0]->host, '--port=' . $cluster->{nodes}->[0]->port,
-	'--use-existing', '--bindir=',
-	'--schedule=parallel_schedule',
-	"--dlpath=${regress_libdir}",
-	'--inputdir=../../src/test/regress',
-    "--outputdir=${regress_outdir}");
+if ($Cluster::pg_15_modules)
+{
+	PostgreSQL::Test::Utils::system_log($ENV{'PG_REGRESS'},
+		'--host=' . $cluster->{nodes}->[0]->host, '--port=' . $cluster->{nodes}->[0]->port,
+		'--use-existing', '--bindir=',
+		'--schedule=parallel_schedule',
+		"--dlpath=${regress_libdir}",
+		'--inputdir=../../src/test/regress',
+		"--outputdir=${regress_outdir}");
+}
+else
+{
+	TestLib::system_log($ENV{'PG_REGRESS'},
+		'--host=' . $cluster->{nodes}->[0]->host, '--port=' . $cluster->{nodes}->[0]->port,
+		'--use-existing', '--bindir=',
+		'--schedule=parallel_schedule',
+		"--dlpath=${regress_libdir}",
+		'--inputdir=../../src/test/regress',
+		"--outputdir=${regress_outdir}");
+}
 unlink('parallel_schedule');
 
 # rename s/diffs/diff as some upper level testing systems are searching for all
@@ -114,7 +149,15 @@
   or die "cannot rename file: $!";
 
 # strip absolute paths and dates out of resulted regression.diffs
-my $res_diff = TestLib::slurp_file("${regress_outdir}/regression.diff");
+my $res_diff;
+if ($Cluster::pg_15_modules)
+{
+	$res_diff = PostgreSQL::Test::Utils::slurp_file("${regress_outdir}/regression.diff");
+}
+else
+{
+	$res_diff = TestLib::slurp_file("${regress_outdir}/regression.diff");
+}
 # In <= 11 default diff format was context, since 12 unified; handing lines
 # starting with ---|+++|*** covers both.
 # To make someone's life easier, we prepend .. to make relative paths correct.
@@ -134,7 +177,14 @@
 # finally compare regression.diffs with our version
 # Do not use diffs extension as some upper level testing systems are searching for all
 # *.diffs files.
-TestLib::append_to_file("$ENV{TESTDIR}/results/regression.diff", $res_diff);
+if ($Cluster::pg_15_modules)
+{
+	PostgreSQL::Test::Utils::append_to_file("$ENV{TESTDIR}/results/regression.diff", $res_diff);
+}
+else
+{
+    TestLib::append_to_file("$ENV{TESTDIR}/results/regression.diff", $res_diff);
+}
 # TODO: work with diffs on per-test basis
 my $expected_file;
 if (Cluster::is_ee())
@@ -145,7 +195,14 @@
 {
 	$expected_file = "expected/regression_vanilla.diff"
 }
-$diff = TestLib::system_log("diff -U3 ${expected_file} $ENV{TESTDIR}/results/regression.diff");
+if ($Cluster::pg_15_modules)
+{
+	$diff = PostgreSQL::Test::Utils::system_log("diff -U3 ${expected_file} $ENV{TESTDIR}/results/regression.diff");
+}
+else
+{
+	$diff = TestLib::system_log("diff -U3 ${expected_file} $ENV{TESTDIR}/results/regression.diff");
+}
 run [ "diff", "-U3", "${expected_file}", "$ENV{TESTDIR}/results/regression.diff" ], ">", "$ENV{TESTDIR}/regression.diff.diff";
 my $res = $?;
 
diff --git a/t/002_regressmm.pl b/t/002_regressmm.pl
@@ -3,7 +3,14 @@
 use Test::More tests => 1;
 
 # determenistic ports for expected files
-$PostgresNode::last_port_assigned = 55431;
+if ($Cluster::pg_15_modules)
+{
+	$PostgreSQL::Test::Cluster::last_port_assigned = 55431;
+}
+else
+{
+	$PostgresNode::last_port_assigned = 55431;
+}
 
 my $cluster = new Cluster(3);
 $cluster->init(q{
@@ -23,11 +30,25 @@
 	push @tests, 'atx';
 }
 
-my $ret = TestLib::system_log($ENV{'PG_REGRESS'},
-	'--host=' . $cluster->{nodes}->[0]->host, '--port=' . $cluster->{nodes}->[0]->port,
-    '--use-existing', '--bindir=', @tests);
-if ($ret != 0)
+my $ret;
+if ($Cluster::pg_15_modules)
+{
+	$ret = PostgreSQL::Test::Utils::system_log($ENV{'PG_REGRESS'},
+		'--host=' . $cluster->{nodes}->[0]->host, '--port=' . $cluster->{nodes}->[0]->port,
+		'--use-existing', '--bindir=', @tests);
+	if ($ret != 0)
+	{
+		print "### Got regression! \n", PostgreSQL::Test::Utils::slurp_file('regression.diffs');
+	}
+}
+else
 {
-    print "### Got regression! \n", TestLib::slurp_file('regression.diffs');
+	$ret = TestLib::system_log($ENV{'PG_REGRESS'},
+		'--host=' . $cluster->{nodes}->[0]->host, '--port=' . $cluster->{nodes}->[0]->port,
+		'--use-existing', '--bindir=', @tests);
+	if ($ret != 0)
+	{
+		print "### Got regression! \n", TestLib::slurp_file('regression.diffs');
+	}
 }
 is($ret, 0, "multimaster regress");
diff --git a/t/003_basic_recovery.pl b/t/003_basic_recovery.pl
@@ -4,7 +4,6 @@
 use strict;
 use warnings;
 use Cluster;
-use TestLib;
 use Test::More tests => 4;
 
 my $cluster = new Cluster(3);
diff --git a/t/004_recovery.pl b/t/004_recovery.pl
@@ -2,7 +2,6 @@
 use warnings;
 
 use Cluster;
-use TestLib;
 use Test::More tests => 6;
 
 my $cluster = new Cluster(3);
diff --git a/t/005_pgbench.pl b/t/005_pgbench.pl
@@ -5,7 +5,6 @@
 use warnings;
 
 use Cluster;
-use TestLib;
 use Test::More tests => 2;
 
 my $cluster = new Cluster(2);
diff --git a/t/006_pgbenchdl.pl b/t/006_pgbenchdl.pl
@@ -5,7 +5,6 @@
 use warnings;
 
 use Cluster;
-use TestLib;
 use Test::More tests => 1;
 use Data::Dumper;
 
diff --git a/t/007_add_stop_node.pl b/t/007_add_stop_node.pl
@@ -2,9 +2,7 @@
 use warnings;
 
 use Carp;
-use PostgresNode;
 use Cluster;
-use TestLib;
 use Test::More tests => 8;
 
 # Generally add node with concurrent load (and failures) is not supported
diff --git a/t/008_bugfixes.pl b/t/008_bugfixes.pl
@@ -2,11 +2,9 @@
 use POSIX;
 use strict;
 use Test::More;
-use TestLib;
 use Time::HiRes qw(usleep);
 use warnings;
 
-use PostgresNode;
 use Cluster;
 
 use Test::More tests => Cluster::is_ee() ? 6 : 5;
diff --git a/t/009_identity_func.pl b/t/009_identity_func.pl
@@ -1,8 +1,6 @@
 use strict;
 use warnings;
-use PostgresNode;
 use Cluster;
-use TestLib;
 use Test::More tests => 29;
 
 my $cluster = new Cluster(3);
