diff --git a/doc/xml/release.xml b/doc/xml/release.xml index c6edef67e..b46bfd6fd 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -140,6 +140,10 @@

Update parameters for VBoxService start.

+ + +

Make ls ordering deterministic in mock/all test.

+
diff --git a/test/expect/mock-all-001.log b/test/expect/mock-all-001.log index 2c609f817..19f4da879 100644 --- a/test/expect/mock-all-001.log +++ b/test/expect/mock-all-001.log @@ -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 diff --git a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm index da5440360..a3a464d2d 100644 --- a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm @@ -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}); }