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

Only check expect logs on CentOS 7.

Browse Source 
Variations in distros cause false negatives in tests but don't add much value.
This commit is contained in:
David Steele
2017-11-14 17:16:39 -05:00
parent 3ee269c099
commit 22fe684b1f
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/lib/pgBackRestTest/Common/RunTest.pm
View File

@@ -201,14 +201,19 @@ sub begin
$self->end();
# If bExpect is defined then it is an override of the default
if (defined($bExpect))
$self->{bExpect} = false;
if ($self->vm() eq VM_EXPECT)
{
$self->{bExpect} = $bExpect;
}
# Else get the default expect setting
else
{
$self->{bExpect} = (testDefModuleTest($self->{strModule}, $self->{strModuleTest}))->{&TESTDEF_EXPECT};
if (defined($bExpect))
{
$self->{bExpect} = $bExpect;
}
# Else get the default expect setting
else
{
$self->{bExpect} = (testDefModuleTest($self->{strModule}, $self->{strModuleTest}))->{&TESTDEF_EXPECT};
}
}
# Increment the run counter;
@@ -237,8 +242,9 @@ sub begin
$strExe, dirname($self->testPath()), $self->basePath(), $self->module(), $self->moduleTest(), $self->runCurrent(),
true);
}
# Else if the module is defined then create a ExpectTest object
elsif ($self->doExpect())
# Create an ExpectTest object
if ($self->doExpect())
{
$self->{oExpect} = new pgBackRestTest::Common::LogTest(
$self->module(), $self->moduleTest(), $self->runCurrent(), $self->doLogForce(), $strDescription, $strExe,