db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Make ls ordering deterministic in mock/all test.

Browse Source
This commit is contained in:
David Steele 2018-07-01 20:02:37 -04:00
parent 1bd98b61df
commit 3d07e01fe9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@ -140,6 +140,10 @@
<release-item>
<p>Update parameters for <file>VBoxService</file> start.</p>
</release-item>
<release-item>
<p>Make <file>ls</file> ordering deterministic in <id>mock</id>/<id>all</id> test.</p>
</release-item>
</release-development-list>
</release-test-list>
</release>

6
test/expect/mock-all-001.log
View File

@ -5201,13 +5201,14 @@ info bogus stanza - bogus stanza (db-master host)
}
]
> ls -1R [TEST_PATH]/db-master/repo/backup/db/backup.history
> ls -1Rtr [TEST_PATH]/db-master/repo/backup/db/backup.history
------------------------------------------------------------------------------------------------------------------------------------
[TEST_PATH]/db-master/repo/backup/db/backup.history:
[YEAR-1]
[TEST_PATH]/db-master/repo/backup/db/backup.history/[YEAR-1]:
[BACKUP-FULL-1].manifest.gz
[BACKUP-FULL-2].manifest.gz
[BACKUP-INCR-1].manifest.gz
[BACKUP-INCR-2].manifest.gz
[BACKUP-DIFF-1].manifest.gz
@ -5217,9 +5218,8 @@ info bogus stanza - bogus stanza (db-master host)
[BACKUP-DIFF-3].manifest.gz
[BACKUP-INCR-5].manifest.gz
[BACKUP-DIFF-4].manifest.gz
[BACKUP-FULL-2].manifest.gz
[BACKUP-DIFF-5].manifest.gz
[BACKUP-FULL-3].manifest.gz
[BACKUP-DIFF-5].manifest.gz
diff backup - config file warning on local (db-master host)
> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=info 2>&1 --type=diff --stanza=db backup

2
test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
View File

@ -1265,7 +1265,7 @@ sub run
#---------------------------------------------------------------------------------------------------------------------------
if (!$bRemote && !$bS3)
{
executeTest('ls -1R ' . storageRepo()->pathGet('backup/' . $self->stanza() . '/' . PATH_BACKUP_HISTORY),
executeTest('ls -1Rtr ' . storageRepo()->pathGet('backup/' . $self->stanza() . '/' . PATH_BACKUP_HISTORY),
{oLogTest => $self->expect(), bRemote => $bRemote});
}