Date: Mon, 16 May 2022 14:30:00 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Noah Misch <noah@leadboat.com>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, Andres Freund <andres@anarazel.de>,
	Thomas Munro <thomas.munro@gmail.com>,
	Julien Rouhaud <rjuju123@gmail.com>,
	Andrew Dunstan <andrew@dunslane.net>,
	Postgres hackers <pgsql-hackers@lists.postgresql.org>
Subject: Re: Rewriting the test of pg_upgrade as a TAP test - take three -
 remastered set
Message-ID: <YoHhWD5vQzb2mmiF@paquier.xyz>
References: <20220331053616.u446wsr732quuzer@alap3.anarazel.de>
 <YkVetIPIk1ScfC9Q@paquier.xyz>
 <547429.1648734590@sss.pgh.pa.us>
 <YkZSgJ8tGy2tAWwf@paquier.xyz>
 <20220502042718.GB1565149@rfd.leadboat.com>
 <YniID7Lm9bZUoQXl@paquier.xyz>
 <YnsRiDW5tY8z0oCf@paquier.xyz>
 <20220511053255.GA2578591@rfd.leadboat.com>
 <YnyawnlheodeuFfS@paquier.xyz>
 <20220514082728.GE2684227@rfd.leadboat.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="/jlwOBGEgC16HAIk"
Content-Disposition: inline
In-Reply-To: <20220514082728.GE2684227@rfd.leadboat.com>
Archived-At: 
 <https://www.postgresql.org/message-id/YoHhWD5vQzb2mmiF%40paquier.xyz>
Precedence: bulk


--/jlwOBGEgC16HAIk
Content-Type: multipart/mixed; boundary="1lenwIkZl3c6mcbU"
Content-Disposition: inline


--1lenwIkZl3c6mcbU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, May 14, 2022 at 01:27:28AM -0700, Noah Misch wrote:
> Here, I requested the rationale for the differences you had just described.
> You made a choice to stop testing one list of database names and start testing
> a different list of database names.  Why?

Because the shape of the new names does not change the test coverage
("regression" prefix or the addition of the double quotes with
backslashes for all the database names), while keeping the code a bit
simpler.  If you think that the older names are more adapted, I have
no objections to use them, FWIW, which is something like the patch
attached would achieve.

This uses the same convention as vcregress.pl before 322becb, but not
the one of test.sh where "regression" was appended to the database
names.
--
Michael

--1lenwIkZl3c6mcbU
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="upgrade-tap-fixes-noah-2.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/=
002_pg_upgrade.pl
index 8372a85e6e..33a75991d8 100644
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -13,18 +13,16 @@ use Test::More;
 # Generate a database with a name made of a range of ASCII characters.
 sub generate_db
 {
-	my ($node, $from_char, $to_char) =3D @_;
+	my ($node, $prefix, $from_char, $to_char, $suffix) =3D @_;
=20
-	my $dbname =3D '';
+	my $dbname =3D $prefix;
 	for my $i ($from_char .. $to_char)
 	{
 		next if $i =3D=3D 7 || $i =3D=3D 10 || $i =3D=3D 13;    # skip BEL, LF, =
and CR
 		$dbname =3D $dbname . sprintf('%c', $i);
 	}
=20
-	# Exercise backslashes adjacent to double quotes, a Windows special
-	# case.
-	$dbname =3D '\\"\\' . $dbname . '\\\\"\\\\\\';
+	$dbname .=3D $suffix;
 	$node->command_ok([ 'createdb', $dbname ]);
 }
=20
@@ -79,10 +77,12 @@ else
 {
 	# Default is to use pg_regress to set up the old instance.
=20
-	# Create databases with names covering most ASCII bytes
-	generate_db($oldnode, 1,  45);
-	generate_db($oldnode, 46, 90);
-	generate_db($oldnode, 91, 127);
+	# Create databases with names covering most ASCII bytes.  The
+	# first name exercises backslashes adjacent to double quotes, a
+	# Windows special case.
+	generate_db($oldnode, "\\\"\\", 1,  45,  "\\\\\"\\\\\\");
+	generate_db($oldnode, '',       46, 90,  '');
+	generate_db($oldnode, '',       91, 127, '');
=20
 	# Grab any regression options that may be passed down by caller.
 	my $extra_opts =3D $ENV{EXTRA_REGRESS_OPTS} || "";

--1lenwIkZl3c6mcbU--

--/jlwOBGEgC16HAIk
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmKB4VgACgkQnvQgOdby
QH2wTw/7Bvj8VE5EAZWU6QiKQT1PdC6RBNabcFgPlFwI9jgrk3TlibMVjjqHlzZ5
+xQNKlDQBY6hlgzlZGf+bh89o/yFhzfhNprM5ZC/nNn8o3PuJLGSYQMKiHFPO6kb
Di2eLJUur/rzR7gq3Y6ee/oydn40B3e1gwuxZQrONU20Fq8WHUPvUyrkM30oW9Gj
M9ioV8ZF6RjQWGWJ6+DJtXmfSmAMJfbVfcSPzcj3q4ZA49Z/xnogpxps3Al5c8pV
iyzNdAjVdAU0DUEqUoojIWIUvHJTUfvGxvyWyCE928f8w/7Fv3vXkTr0ASLQypKW
MiDaMPwxvYTiesNOLChjSJo3KvF4LiGwzky1GRqVP4w7Zfy2RxrMzti5kWdOw1vb
75jQUSQiqFB88jT/Ss7F9Ka6POgUDY+wFoy5yyculQLtWOlzMGe8oHGCPKs5qN+i
LAO8Hu5Wk6J7nE257BgHMk/R8tk0HQuUSBEeBboybhQiqiTmWsFEvqn1hbT2AMPD
IAHRd0bu6W9zhxrHJCSWo9L80cx3FDKE5vEIVeUaX2KisoPqWGVpec8BK7yFAMvY
oOxnEYSIW3ghF6xNMia2gZ/JxCq1CuT4BSD6RgqLgEEktA6zOzkPIZN0m/MstsLf
Oo21k43a+c//FiIUvlBdJs7y/1DaZH8zyRJh87I5ZOhqWqK8Lbc=
=6G8y
-----END PGP SIGNATURE-----

--/jlwOBGEgC16HAIk--