db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-10-30 23:37:45 +02:00
Code Issues Releases Activity

Create test matrix for mock/expire to increase coverage and reduce tests.

Browse Source 
The same test configurations are run on all four test VMs, which seems a real waste of resources.

Vary the tests per VM to increase coverage while reducing the total number of tests.
This commit is contained in:
David Steele
2019-03-01 19:04:26 +02:00
parent 91622942c2
commit f7d1d4400f
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/xml/release.xml
View File

@@ -150,7 +150,7 @@
<release-test-list>
<release-development-list>
<release-item>
<p>Create test matrix for <id>mock/archive</id>, <id>mock/archive-stop</id>, and <id>mock/stanza</id> to increase coverage and reduce tests.</p>
<p>Create test matrix for <id>mock/archive</id>, <id>mock/archive-stop</id>, <id>mock/expire</id>, and <id>mock/stanza</id> to increase coverage and reduce tests.</p>
</release-item>
<release-item>

2
test/define.yaml
View File

@@ -784,7 +784,7 @@ integration:
# ----------------------------------------------------------------------------------------------------------------------------
- name: expire
total: 4
total: 2
# ----------------------------------------------------------------------------------------------------------------------------
- name: archive

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

@@ -28,6 +28,7 @@ use pgBackRest::Protocol::Storage::Helper;
use pgBackRestTest::Common::ExecuteTest;
use pgBackRestTest::Common::RunTest;
use pgBackRestTest::Common::VmTest;
use pgBackRestTest::Env::ExpireEnvTest;
use pgBackRestTest::Env::Host::HostS3Test;
use pgBackRestTest::Env::HostEnvTest;
@@ -76,17 +77,28 @@ sub run
my $lBaseTime = time() - (SECONDS_PER_DAY * 56);
my $strDescription;
my $bS3 = false;
foreach my $bRepoEncrypt (false, true)
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},
)
{
# Only run tests for this vm
next if ($rhRun->{vm} ne $self->vm());
# Increment the run, log, and decide whether this unit test should be run
my $bS3 = $rhRun->{s3};
my $bEncrypt = $rhRun->{encrypt};
############################################################################################################################
# Pass !$bRepoEncrypt so expect logs are not generated for encryption tests
if ($self->begin("local, enc ${bRepoEncrypt}", !$bRepoEncrypt))
# Pass !$bEncrypt so expect logs are not generated for encryption tests
if ($self->begin("local, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
{
# Create hosts, file object, and config
my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(
true, $self->expect(), {bS3 => $bS3, bRepoEncrypt => $bRepoEncrypt});
true, $self->expect(), {bS3 => $bS3, bRepoEncrypt => $bEncrypt});
$self->initStanzaOption($oHostDbMaster->dbBasePath(), $oHostBackup->{strRepoPath}, $oHostS3);
$self->configTestLoad(CFGCMD_STANZA_CREATE);
@@ -181,12 +193,12 @@ sub run
}
############################################################################################################################
# Pass !$bRepoEncrypt so expect logs are not generated for encryption tests
if ($self->begin("Expire::stanzaUpgrade, enc ${bRepoEncrypt}", !$bRepoEncrypt))
# Pass !$bEncrypt so expect logs are not generated for encryption tests
if ($self->begin("Expire::stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
{
# Create hosts, file object, and config
my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(
true, $self->expect(), {bS3 => $bS3, bRepoEncrypt => $bRepoEncrypt});
true, $self->expect(), {bS3 => $bS3, bRepoEncrypt => $bEncrypt});
$self->initStanzaOption($oHostDbMaster->dbBasePath(), $oHostBackup->{strRepoPath}, $oHostS3);
$self->configTestLoad(CFGCMD_STANZA_CREATE);