1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-18 04:58:51 +02:00

Fixed flapping archive stop tests.

This commit is contained in:
David Steele 2017-04-04 21:15:22 -04:00
parent beead043ac
commit 9eae36a702
2 changed files with 8 additions and 5 deletions

View File

@ -179,6 +179,10 @@
<release-item>
<p>Updated vagrant to new version and image.</p>
</release-item>
<release-item>
<p>Fixed flapping archive stop tests.</p>
</release-item>
</release-refactor-list>
</release-test-list>
</release>

View File

@ -96,19 +96,18 @@ sub run
#---------------------------------------------------------------------------------------------------------------------------
$self->testResult(
sub {$oFile->list(PATH_BACKUP_ARCHIVE, PG_VERSION_94 . '-1/0000000100000001')},
sub {$oFile->list(PATH_BACKUP_ARCHIVE, PG_VERSION_94 . '-1/0000000100000001', '^(?!000000010000000100000002).+')},
"000000010000000100000001-72b9da071c13957fb4ca31f05dbd5c644297c2f7${strCompressExt}",
'segment 2-4 are not pushed', 5);
'segment 2-4 not pushed (2 is pushed sometimes when remote but ignore)', 5);
#---------------------------------------------------------------------------------------------------------------------------
$oHostDbMaster->archivePush($strXlogPath, $strArchiveTestFile, 5);
$self->testResult(
sub {$oFile->list(PATH_BACKUP_ARCHIVE, PG_VERSION_94 . '-1/0000000100000001')},
sub {$oFile->list(PATH_BACKUP_ARCHIVE, PG_VERSION_94 . '-1/0000000100000001', '^(?!000000010000000100000002).+')},
"(000000010000000100000001-72b9da071c13957fb4ca31f05dbd5c644297c2f7${strCompressExt}, " .
($bRemote ? "000000010000000100000002-72b9da071c13957fb4ca31f05dbd5c644297c2f7${strCompressExt}, " : '') .
"000000010000000100000005-72b9da071c13957fb4ca31f05dbd5c644297c2f7${strCompressExt})",
'segment 5 (and 2 if remote) is pushed', 5);
'segment 5 is pushed', 5);
}
}
}