db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-05 00:28:52 +02:00
Code Issues Releases Activity

Remove test point infrastructure.

Browse Source 
82df7e6f and 9856fef5 updated tests that used test points in preparation for the feature not being available in the C code.

Since tests points are no longer used remove the infrastructure.

Also remove one stray --test option in mock/all that was essentially a noop but no longer works now that the option has been removed.
This commit is contained in:
David Steele
2019-12-10 13:16:47 -05:00
parent d7d663c2b9
commit d0ba8ff58c
20 changed files with 23 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/lib/pgBackRestTest/Common/ExecuteTest.pm
View File

@ -131,13 +131,11 @@ sub endRetry
my
(
$strOperation,
$strTest,
$bWait
) =
logDebugParam
(
__PACKAGE__ . '->endRetry', \@_,
{name => 'strTest', required => false, trace => true},
{name => 'bWait', required => false, default => true, trace => true}
);
@ -173,12 +171,6 @@ sub endRetry
{
syswrite(*STDOUT, " ${strLine}\n")
}
if (defined($strTest) && testCheck($strLine, $strTest))
{
&log(DEBUG, "Found test ${strTest}");
return true;
}
}
# Drain the stderr stream
@ -272,11 +264,6 @@ sub endRetry
print "output:\n$self->{strOutLog}\n";
}
if (defined($strTest))
{
confess &log(ASSERT, "test point ${strTest} was not found");
}
# Return from function and log return values if any
return logDebugReturn
(
@ -296,13 +283,11 @@ sub end
my
(
$strOperation,
$strTest,
$bWait
) =
logDebugParam
(
__PACKAGE__ . '->end', \@_,
{name => 'strTest', required => false, trace => true},
{name => 'bWait', required => false, default => true, trace => true}
);
@ -311,7 +296,7 @@ sub end
if (!defined($self->{iRetrySeconds}))
{
$iExitStatus = $self->endRetry($strTest, $bWait);
$iExitStatus = $self->endRetry($bWait);
}
# Else loop until success or timeout
else
@ -322,7 +307,7 @@ sub end
{
$self->{bRetry} = false;
$self->begin();
$iExitStatus = $self->endRetry($strTest, $bWait);
$iExitStatus = $self->endRetry($bWait);
if ($self->{bRetry})
{
@ -334,7 +319,7 @@ sub end
if ($self->{bRetry})
{
$self->begin();
$iExitStatus = $self->endRetry($strTest, $bWait);
$iExitStatus = $self->endRetry($bWait);
}
}
@ -353,16 +338,9 @@ sub executeTest
{
my $strCommand = shift;
my $oParam = shift;
my $strTest = shift;
my $oExec = new pgBackRestTest::Common::ExecuteTest($strCommand, $oParam);
$oExec->begin();
if (defined($strTest))
{
$oExec->end($strTest);
}
$oExec->end();
return $oExec->{strOutLog};