mirror of
https://github.com/postgres/postgres.git
synced 2025-06-16 06:01:02 +03:00
Use test functions in pg_rewind test module
Commit61081e75c
introduced pg_rewind along with the test suite, which ensured that subroutines didn't incur more than one test to plan. Now that we no longer explicitly plan tests (since549ec201d
), we can use the usual Test::More functions. Reviewed-by: Andrew Dunstan <andrew@dunslane.net> Discussion: https://postgr.es/m/AA527525-F0CC-4AA2-AF98-543CABFDAF59@yesql.se
This commit is contained in:
@ -102,21 +102,10 @@ sub check_query
|
|||||||
],
|
],
|
||||||
'>', \$stdout, '2>', \$stderr;
|
'>', \$stdout, '2>', \$stderr;
|
||||||
|
|
||||||
# We don't use ok() for the exit code and stderr, because we want this
|
is($result, 1, "$test_name: psql exit code");
|
||||||
# check to be just a single test.
|
is($stderr, '', "$test_name: psql no stderr");
|
||||||
if (!$result)
|
is($stdout, $expected_stdout, "$test_name: query result matches");
|
||||||
{
|
|
||||||
fail("$test_name: psql exit code");
|
|
||||||
}
|
|
||||||
elsif ($stderr ne '')
|
|
||||||
{
|
|
||||||
diag $stderr;
|
|
||||||
fail("$test_name: psql no stderr");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
is($stdout, $expected_stdout, "$test_name: query result matches");
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user