mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When a TAP file has non-zero exit status, retain temporary directories.

Browse Source 
PostgresNode already retained base directories in such cases.  Stop
using $SIG{__DIE__}, which is redundant with the exit status check, in
lieu of proliferating it to TestLib.  Back-patch to 9.6, where commit
88802e068017bee8cea7a5502a712794e761c7b5 introduced retention on
failure.

Reviewed by Daniel Gustafsson.

Discussion: https://postgr.es/m/20200202170155.GA3264196@rfd.leadboat.com
This commit is contained in:
Noah Misch 2020-02-05 08:26:41 -08:00
parent 815c2f0972
commit bf989aaf35
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/perl/PostgresNode.pm
View File

@ -1233,20 +1233,6 @@ sub can_bind
return $ret; return $ret;
} }
# Retain the errno on die() if set, else assume a generic errno of 1.
# This will instruct the END handler on how to handle artifacts left
# behind from tests.
$SIG{__DIE__} = sub {
if ($!)
{
$died = $!;
}
else
{
$died = 1;
}
};
# Automatically shut down any still-running nodes when the test script exits. # Automatically shut down any still-running nodes when the test script exits.
# Note that this just stops the postmasters (in the same order the nodes were # Note that this just stops the postmasters (in the same order the nodes were
# created in). Any temporary directories are deleted, in an unspecified # created in). Any temporary directories are deleted, in an unspecified
@ -1265,8 +1251,7 @@ END
next if defined $ENV{'PG_TEST_NOCLEAN'}; next if defined $ENV{'PG_TEST_NOCLEAN'};
# clean basedir on clean test invocation # clean basedir on clean test invocation
$node->clean_node $node->clean_node if $exit_code == 0 && TestLib::all_tests_passing();
if TestLib::all_tests_passing() && !defined $died && !$exit_code;
} }
$? = $exit_code; $? = $exit_code;

9
src/test/perl/TestLib.pm
View File

@ -183,8 +183,13 @@ INIT
END END
{ {
# Preserve temporary directory for this test on failure # Test files have several ways of causing prove_check to fail:
$File::Temp::KEEP_ALL = 1 unless all_tests_passing(); # 1. Exit with a non-zero status.
# 2. Call ok(0) or similar, indicating that a constituent test failed.
# 3. Deviate from the planned number of tests.
#
# Preserve temporary directories after (1) and after (2).
$File::Temp::KEEP_ALL = 1 unless $? == 0 && all_tests_passing();
} }
=pod =pod