From 75a006beef6c502a16bc4e1c0dc4d67d2cd5de9c Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Mon, 25 Apr 2022 09:14:19 -0400 Subject: [PATCH] Remove some recently-added pg_dump test cases. Commit d2d35479796c3510e249d6fc72adbd5df918efbf included a pretty extensive set of test cases, and some of them don't work on all of our Windows machines. This happens because IPC::Run expands its arguments as shell globs on a few machines, but doesn't on most of the buildfarm. It might be good to fix that problem systematically somehow, but in the meantime, there are enough test cases for this commit that it seems OK to just remove the ones that are failing. Discussion: http://postgr.es/m/3a190754-b2b0-d02b-dcfd-4ec1610ffbcb@dunslane.net Discussion: http://postgr.es/m/CA+TgmoYRGUcFBy6VgN0+Pn4f6Wv=2H0HZLuPHqSy6VC8Ba7vdg@mail.gmail.com --- src/bin/pg_dump/t/002_pg_dump.pl | 34 ++------------------------------ 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index 2c0167fdc5f..7b0ac9ca421 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -3601,8 +3601,8 @@ my $supports_lz4 = check_pg_config("#define HAVE_LIBLZ4 1"); $node->psql('postgres', 'create database regress_pg_dump_test;'); # Start with number of command_fails_like()*2 tests below (each -# command_fails_like is actually 2 tests) -my $num_tests = 42; +# command_fails_like is actually 2 tests) + number of command_ok()*3 +my $num_tests = 33; foreach my $run (sort keys %pgdump_runs) { @@ -3784,18 +3784,6 @@ command_fails_like( 'pg_dumpall: option --exclude-database rejects multipart pattern "."' ); -command_fails_like( - [ 'pg_dumpall', '-p', "$port", '--exclude-database', '.*' ], - qr/pg_dumpall: error: improper qualified name \(too many dotted names\): \.\*/, - 'pg_dumpall: option --exclude-database rejects multipart pattern ".*"' -); - -command_fails_like( - [ 'pg_dumpall', '-p', "$port", '--exclude-database', '*.*' ], - qr/pg_dumpall: error: improper qualified name \(too many dotted names\): \*\.\*/, - 'pg_dumpall: option --exclude-database rejects multipart pattern "*.*"' -); - command_fails_like( [ 'pg_dumpall', '-p', "$port", '--exclude-database', 'myhost.mydb' ], qr/pg_dumpall: error: improper qualified name \(too many dotted names\): myhost\.mydb/, @@ -3810,12 +3798,6 @@ $node->command_ok( 'pg_dumpall: option --exclude-database handles database names with embedded dots' ); -$node->command_ok( - [ 'pg_dumpall', '-p', "$port", '--exclude-database', '??*' ], - 'pg_dumpall: option --exclude-database handles database name patterns' -); - - ######################################### # Test invalid multipart schema names @@ -3843,24 +3825,12 @@ command_fails_like( 'pg_dump: option --schema rejects degenerate two-part schema name: "."' ); -command_fails_like( - [ 'pg_dump', '-p', "$port", '--schema', '.*' ], - qr/pg_dump: error: cross-database references are not implemented: \.\*/, - 'pg_dump: option --schema rejects degenerate two-part schema name: ".*"' -); - command_fails_like( [ 'pg_dump', '-p', "$port", '--schema', '..' ], qr/pg_dump: error: improper qualified name \(too many dotted names\): \.\./, 'pg_dump: option --schema rejects degenerate three-part schema name: ".."' ); -command_fails_like( - [ 'pg_dump', '-p', "$port", '--schema', '.*.*' ], - qr/pg_dump: error: improper qualified name \(too many dotted names\): \.\*\.\*/, - 'pg_dump: option --schema rejects degenerate three-part schema pattern: ".*.*"' -); - ######################################### # Test invalid multipart relation names