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

Update mock/expire module test matrix so expect tests output.

Browse Source 
Also add an error message to prevent regression.

Contributed by Cynthia Shang.
This commit is contained in:
Cynthia Shang
2019-05-16 09:53:55 -04:00
committed by David Steele
parent c51274d1b6
commit 19d8358cba
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
View File

@ -79,10 +79,10 @@ sub run
foreach my $rhRun
(
{vm => VM1, s3 => false, encrypt => false},
{vm => VM2, s3 => true, encrypt => false},
{vm => VM3, s3 => true, encrypt => true},
{vm => VM4, s3 => false, encrypt => true},
{vm => VM1, s3 => true, encrypt => false},
{vm => VM2, s3 => false, encrypt => true},
{vm => VM3, s3 => false, encrypt => false},
{vm => VM4, s3 => true, encrypt => true},
)
{
# Only run tests for this vm
@ -92,9 +92,13 @@ sub run
my $bS3 = $rhRun->{s3};
my $bEncrypt = $rhRun->{encrypt};
if ($bS3 && ($self->vm() eq VM3))
{
confess &log("cannot configure s3 for expect log tests");
}
############################################################################################################################
# Pass !$bEncrypt so expect logs are not generated for encryption tests
if ($self->begin("local, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
if ($self->begin("simple, enc ${bEncrypt}, s3 ${bS3}"))
{
# Create hosts, file object, and config
my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(
@ -193,8 +197,7 @@ sub run
}
############################################################################################################################
# Pass !$bEncrypt so expect logs are not generated for encryption tests
if ($self->begin("Expire::stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
if ($self->begin("stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}"))
{
# Create hosts, file object, and config
my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(