db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-05-22 10:15:16 +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
doc/xml/release.xml
+8
View File
@@ -237,6 +237,14 @@
<release-item> <release-item>
<p>Reduce <proper>ScalityS3</proper> processes since only two are needed.</p> <p>Reduce <proper>ScalityS3</proper> processes since only two are needed.</p>
</release-item> </release-item>
<release-item>
<release-item-contributor-list>
<release-item-contributor id="cynthia.shang"/>
</release-item-contributor-list>
<p>Update <id>mock/expire</id> module test matrix so expect tests output.</p>
</release-item>
</release-development-list> </release-development-list>
</release-test-list> </release-test-list>
</release> </release>
test/expect/mock-expire-001.log
+2 -2
View File
@@ -1,5 +1,5 @@
run 001 - local, enc 0 run 001 - simple, enc 0, s3 0
====================== =============================
* full backup: label = [BACKUP-FULL-1], start = 000000010000000000000000, stop = 000000010000000000000002 * full backup: label = [BACKUP-FULL-1], start = 000000010000000000000000, stop = 000000010000000000000002
* incr backup: label = [BACKUP-INCR-1], prior = [BACKUP-FULL-1], start = 000000010000000000000006, stop = 0000000100000000000000FB * incr backup: label = [BACKUP-INCR-1], prior = [BACKUP-FULL-1], start = 000000010000000000000006, stop = 0000000100000000000000FB
test/expect/mock-expire-002.log
+2 -2
View File
@@ -1,5 +1,5 @@
run 002 - Expire::stanzaUpgrade, enc 0 run 002 - stanzaUpgrade, enc 0, s3 0
====================================== ====================================
* full backup: label = [BACKUP-FULL-1], start = 000000010000000000000000, stop = 000000010000000000000002 * full backup: label = [BACKUP-FULL-1], start = 000000010000000000000000, stop = 000000010000000000000002
* incr backup: label = [BACKUP-INCR-1], prior = [BACKUP-FULL-1], start = 000000010000000000000006, stop = 000000010000000000000008 * incr backup: label = [BACKUP-INCR-1], prior = [BACKUP-FULL-1], start = 000000010000000000000006, stop = 000000010000000000000008
test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
+11 -8
View File
@@ -79,10 +79,10 @@ sub run
foreach my $rhRun foreach my $rhRun
( (
{vm => VM1, s3 => false, encrypt => false}, {vm => VM1, s3 => true, encrypt => false},
{vm => VM2, s3 => true, encrypt => false}, {vm => VM2, s3 => false, encrypt => true},
{vm => VM3, s3 => true, encrypt => true}, {vm => VM3, s3 => false, encrypt => false},
{vm => VM4, s3 => false, encrypt => true}, {vm => VM4, s3 => true, encrypt => true},
) )
{ {
# Only run tests for this vm # Only run tests for this vm
@@ -92,9 +92,13 @@ sub run
my $bS3 = $rhRun->{s3}; my $bS3 = $rhRun->{s3};
my $bEncrypt = $rhRun->{encrypt}; 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("simple, enc ${bEncrypt}, s3 ${bS3}"))
if ($self->begin("local, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
{ {
# Create hosts, file object, and config # Create hosts, file object, and config
my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup( 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("stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}"))
if ($self->begin("Expire::stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
{ {
# Create hosts, file object, and config # Create hosts, file object, and config
my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup( my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(