Eliminate redundancy in real tests.

2025-09-16 09:06:18 +02:00 · 2017-06-21 16:07:13 -04:00
parent edada21866
commit 64ec7eb490
19 changed files with 876 additions and 1733 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,21 +13,12 @@ services:
  - docker

 env:
-  - PGB_TEST_VM="co6" PGB_BUILD_PARAM="--db=none" PGB_TEST_PARAM="--vm-max=2 --module=common --module=help --module=config --module=storage --module=protocol --module=info --module=archive --module=backup --module=expire --module=stanza --module=mock"
-  - PGB_TEST_VM="co6" PGB_BUILD_PARAM="--db=9.1" PGB_TEST_PARAM="--module=real --db=9.1 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="co6" PGB_BUILD_PARAM="--db=9.0" PGB_TEST_PARAM="--module=real --db=9.0 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="u16" PGB_BUILD_PARAM="--db=none" PGB_TEST_PARAM="--vm-max=2 --module=common --module=help --module=config --module=storage --module=protocol --module=info --module=archive --module=backup --module=expire --module=stanza --module=mock --no-lint"
-  - PGB_TEST_VM="u16" PGB_BUILD_PARAM="--db=9.4" PGB_TEST_PARAM="--module=real --db=9.4 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="d8" PGB_BUILD_PARAM="--db=none" PGB_TEST_PARAM="--vm-max=2 --module=common --module=help --module=config --module=storage --module=protocol --module=info --module=archive --module=backup --module=expire --module=stanza --module=mock --no-lint"
-  - PGB_TEST_VM="d8" PGB_BUILD_PARAM="--db=9.3" PGB_TEST_PARAM="--module=real --db=9.3 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="d8" PGB_BUILD_PARAM="--db=8.4" PGB_TEST_PARAM="--module=real --db=8.4 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="co7" PGB_BUILD_PARAM="--db=none" PGB_TEST_PARAM="--vm-max=2 --module=common --module=help --module=config --module=storage --module=protocol --module=info --module=archive --module=backup --module=expire --module=stanza --module=mock --no-lint"
-  - PGB_TEST_VM="co7" PGB_BUILD_PARAM="--db=9.6" PGB_TEST_PARAM="--module=real --db=9.6 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="co7" PGB_BUILD_PARAM="--db=9.5" PGB_TEST_PARAM="--module=real --db=9.5 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="u14" PGB_BUILD_PARAM="--db=none" PGB_TEST_PARAM="--vm-max=2 --module=common --module=help --module=config --module=storage --module=protocol --module=info --module=archive --module=backup --module=expire --module=stanza --module=mock --no-lint"
-  - PGB_TEST_VM="u14" PGB_BUILD_PARAM="--db=9.2" PGB_TEST_PARAM="--module=real --db=9.2 --process-max=2 --no-lint --no-package"
-  - PGB_TEST_VM="u12" PGB_BUILD_PARAM="--db=none" PGB_TEST_PARAM="--vm-max=2 --module=common --module=help --module=config --module=storage --module=protocol --module=info --module=archive --module=backup --module=expire --module=stanza --module=mock --no-lint"
-  - PGB_TEST_VM="u12" PGB_BUILD_PARAM="--db=8.3" PGB_TEST_PARAM="--module=real --db=8.3 --process-max=2 --no-lint --no-package"
+  - PGB_TEST_VM="co6" PGB_TEST_PARAM=""
+  - PGB_TEST_VM="u16" PGB_TEST_PARAM=" --no-lint"
+  - PGB_TEST_VM="d8" PGB_TEST_PARAM=" --no-lint"
+  - PGB_TEST_VM="co7" PGB_TEST_PARAM=" --no-lint"
+  - PGB_TEST_VM="u14" PGB_TEST_PARAM=" --no-lint"
+  - PGB_TEST_VM="u12" PGB_TEST_PARAM=" --no-lint"

 before_install:
  - sudo apt-get -qq update && sudo apt-get install libxml-checker-perl libdbd-pg-perl libperl-critic-perl libtemplate-perl libpod-coverage-perl libtest-differences-perl libhtml-parser-perl lintian debhelper txt2man devscripts libjson-perl libio-socket-ssl-perl libxml-libxml-perl python-pip
@@ -54,7 +45,7 @@ install:
    cd ~ && pwd && whoami && umask && groups
    mv ${TRAVIS_BUILD_DIR?} pgbackrest
    rm -rf ${TRAVIS_BUILD_DIR?}
-  - pgbackrest/test/test.pl --vm-build --vm=${PGB_TEST_VM?} ${PGB_BUILD_PARAM?}
+  - pgbackrest/test/test.pl --vm-build --vm=${PGB_TEST_VM?}

 script:
  - pgbackrest/test/test.pl --vm-host=u14 --vm=${PGB_TEST_VM?} ${PGB_TEST_PARAM?}
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -198,6 +198,10 @@
                    <release-item>
                        <p>Consolidate <id>archive-push</id> tests into new <id>archive</id> test.</p>
                    </release-item>
+
+                    <release-item>
+                        <p>Eliminate redundancy in <id>real</id> tests.</p>
+                    </release-item>
                </release-refactor-list>
            </release-test-list>
        </release>
--- a/test/expect/real-all-001.log
+++ b/test/expect/real-all-001.log
@@ -1,5 +1,5 @@
-run 001 - bkp 0, sby 0, dst db-master, asy 0, cmp 0, s3 0
-=========================================================
+run 001 - bkp 0, sby 0, dst db-master, cmp 0, s3 0
+==================================================

 stanza-create db - main create stanza info files (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
@@ -120,10 +120,6 @@ incr backup - fail on archive_mode=always (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db backup
 ------------------------------------------------------------------------------------------------------------------------------------

-incr backup - fail on backup already running (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
 incr backup - update during backup (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -136,6 +132,7 @@ db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db

 [global]
+archive-async=y
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
@@ -251,6 +248,7 @@ db-socket-path=[TEST_PATH]/db-master/db
 recovery-option=standby-mode=on

 [global]
+archive-async=y
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
--- a/test/expect/real-all-002.log
+++ b/test/expect/real-all-002.log
@@ -1,5 +1,5 @@
-run 002 - bkp 0, sby 0, dst db-master, asy 0, cmp 1, s3 0
-=========================================================
+run 002 - bkp 0, sby 1, dst db-master, cmp 0, s3 0
+==================================================

 stanza-create db - main create stanza info files (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
@@ -15,8 +15,14 @@ full backup - update during backup (db-master host)
 db-path=[TEST_PATH]/db-master/db/base
 db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
+db2-host=db-standby
+db2-path=[TEST_PATH]/db-standby/db/base
+db2-user=[USER-1]

 [global]
+compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
 log-level-console=debug
@@ -31,6 +37,99 @@ spool-path=[TEST_PATH]/db-master/spool
 archive-copy=y
 start-fast=y

+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
+-----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-standby/db/base
+db-port=[PORT-2]
+db-socket-path=[TEST_PATH]/db-standby/db
+
+[global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/db-master/pgbackrest.conf
+backup-host=db-master
+backup-user=[USER-1]
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-standby/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-standby/log
+protocol-timeout=60
+spool-path=[TEST_PATH]/db-standby/spool
+
+restore, type 'default', remap - restore backup on replica (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --recovery-option=standby_mode=on --recovery-option="primary_conninfo=host=db-master port=6543 user=replicator"  --link-map="pg_xlog=[TEST_PATH]/db-standby/db/pg_xlog" --link-all --stanza=db restore
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-standby/db/base/recovery.conf
+-----------------------------------------------------------------
+primary_conninfo = 'host=db-master port=6543 user=replicator'
+standby_mode = 'on'
+restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"'
+
+full backup - backup from standby (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --retention-full=1 --backup-standby --type=full --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
+----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-socket-path=[TEST_PATH]/db-master/db
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
+db2-host=db-standby
+db2-path=[TEST_PATH]/db-standby/db/base
+db2-user=[USER-1]
+
+[global]
+archive-async=y
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-master/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-master/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/db-master/repo
+spool-path=[TEST_PATH]/db-master/spool
+
+[global:backup]
+archive-copy=y
+start-fast=y
+
+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
+-----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-standby/db/base
+db-port=[PORT-2]
+db-socket-path=[TEST_PATH]/db-standby/db
+
+[db:restore]
+
+[global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/db-master/pgbackrest.conf
+backup-host=db-master
+backup-user=[USER-1]
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-standby/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-standby/log
+protocol-timeout=60
+spool-path=[TEST_PATH]/db-standby/spool
+
+check db - verify check command on standby (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --log-level-console=detail --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
 incr backup - update during backup (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -41,8 +140,15 @@ incr backup - update during backup (db-master host)
 db-path=[TEST_PATH]/db-master/db/base
 db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
+db2-host=db-standby
+db2-path=[TEST_PATH]/db-standby/db/base
+db2-user=[USER-1]

 [global]
+archive-async=y
+compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
 log-level-console=debug
@@ -57,14 +163,47 @@ spool-path=[TEST_PATH]/db-master/spool
 archive-copy=y
 start-fast=y

+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
+-----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-standby/db/base
+db-port=[PORT-2]
+db-socket-path=[TEST_PATH]/db-standby/db
+
+[db:restore]
+
+[global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/db-master/pgbackrest.conf
+backup-host=db-master
+backup-user=[USER-1]
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-standby/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-standby/log
+protocol-timeout=60
+spool-path=[TEST_PATH]/db-standby/spool
+
 restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
 ----------------------------------------------------------------
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'

+restore, force, backup '[BACKUP-FULL-1]', type 'immediate' (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-FULL-1] --type=immediate --link-all --stanza=db restore
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
+----------------------------------------------------------------
+restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
+recovery_target = 'immediate'
+
 restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------
--- a/test/expect/real-all-003.log
+++ b/test/expect/real-all-003.log
@@ -1,12 +1,12 @@
-run 003 - bkp 0, sby 0, dst db-master, asy 1, cmp 0, s3 0
-=========================================================
+run 003 - bkp 0, sby 1, dst db-standby, cmp 0, s3 0
+===================================================

-stanza-create db - main create stanza info files (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
+stanza-create db - main create stanza info files (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
 ------------------------------------------------------------------------------------------------------------------------------------

-full backup - update during backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+full backup - update during backup (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -17,6 +17,10 @@ db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/db-standby/pgbackrest.conf
+backup-host=db-standby
+backup-user=[USER-1]
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
@@ -25,18 +29,48 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:archive-push]
-archive-async=y
+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
+-----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-standby/db/base
+db-port=[PORT-2]
+db-socket-path=[TEST_PATH]/db-standby/db
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-master/pgbackrest.conf
+db2-host=db-master
+db2-path=[TEST_PATH]/db-master/db/base
+db2-user=[USER-1]
+
+[global]
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-standby/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-standby/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/db-standby/repo
+spool-path=[TEST_PATH]/db-standby/spool

 [global:backup]
 archive-copy=y
 start-fast=y

-incr backup - update during backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+restore, type 'default', remap - restore backup on replica (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --recovery-option=standby_mode=on --recovery-option="primary_conninfo=host=db-master port=6543 user=replicator"  --link-map="pg_xlog=[TEST_PATH]/db-standby/db/pg_xlog" --link-all --stanza=db restore
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-standby/db/base/recovery.conf
+-----------------------------------------------------------------
+primary_conninfo = 'host=db-master port=6543 user=replicator'
+standby_mode = 'on'
+restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"'
+
+full backup - backup from standby (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --retention-full=1 --backup-standby --type=full --stanza=db backup
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -47,6 +81,10 @@ db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/db-standby/pgbackrest.conf
+backup-host=db-standby
+backup-user=[USER-1]
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
@@ -55,24 +93,117 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:archive-push]
+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
+-----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-standby/db/base
+db-port=[PORT-2]
+db-socket-path=[TEST_PATH]/db-standby/db
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-master/pgbackrest.conf
+db2-host=db-master
+db2-path=[TEST_PATH]/db-master/db/base
+db2-user=[USER-1]
+
+[db:restore]
+
+[global]
 archive-async=y
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-standby/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-standby/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/db-standby/repo
+spool-path=[TEST_PATH]/db-standby/spool
+
+[global:backup]
+archive-copy=y
+start-fast=y
+
+check db - verify check command on standby (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --log-level-console=detail --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+incr backup - update during backup (db-standby host)
+> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
+----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-socket-path=[TEST_PATH]/db-master/db
+
+[global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/db-standby/pgbackrest.conf
+backup-host=db-standby
+backup-user=[USER-1]
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-master/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-master/log
+protocol-timeout=60
+spool-path=[TEST_PATH]/db-master/spool
+
+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
+-----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-standby/db/base
+db-port=[PORT-2]
+db-socket-path=[TEST_PATH]/db-standby/db
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-master/pgbackrest.conf
+db2-host=db-master
+db2-path=[TEST_PATH]/db-master/db/base
+db2-user=[USER-1]
+
+[db:restore]
+
+[global]
+archive-async=y
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/db-standby/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-standby/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/db-standby/repo
+spool-path=[TEST_PATH]/db-standby/spool

 [global:backup]
 archive-copy=y
 start-fast=y

 restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
 ----------------------------------------------------------------
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'

+restore, force, backup '[BACKUP-FULL-1]', type 'immediate' (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-FULL-1] --type=immediate --link-all --stanza=db restore
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
+----------------------------------------------------------------
+restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
+recovery_target = 'immediate'
+
 restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------
--- a/test/expect/real-all-004.log
+++ b/test/expect/real-all-004.log
@@ -1,12 +1,108 @@
-run 004 - bkp 0, sby 0, dst db-master, asy 1, cmp 1, s3 0
-=========================================================
+run 004 - bkp 1, sby 0, dst backup, cmp 1, s3 0
+===============================================

-stanza-create db - main create stanza info files (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
+stanza-create db - main create stanza info files (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
 ------------------------------------------------------------------------------------------------------------------------------------

-full backup - update during backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+check db - fail on missing archive.info file (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - force create stanza info files (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+full backup - fail on archive_mode=off (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive_mode=off (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive_mode=off (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+full backup - fail on invalid archive_command (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on invalid archive_command (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on invalid archive_command (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive timeout when archive-check=n (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --no-archive-check --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive mismatch after upgrade (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive mismatch after upgrade (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive timeout (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive timeout (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on backup info mismatch (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on backup info mismatch (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success after backup (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success after backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - fail on backup info file missing from non-empty dir (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - verify success with force (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - fail on database mismatch with directory (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - successfully create stanza files to be upgraded (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-upgrade db - upgrade stanza files online (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-upgrade
+------------------------------------------------------------------------------------------------------------------------------------
+
+full backup - update during backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -17,6 +113,10 @@ db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
+backup-user=[USER-1]
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
 log-level-console=debug
@@ -24,18 +124,46 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:archive-push]
-archive-async=y
+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
+[db]
+db-cmd=[BACKREST-BIN]
+db-config=[TEST_PATH]/db-master/pgbackrest.conf
+db-host=db-master
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-user=[USER-2]
+
+[global]
+db-timeout=45
+lock-path=[TEST_PATH]/backup/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/backup/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/backup/repo

 [global:backup]
 archive-copy=y
 start-fast=y

-incr backup - update during backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+stop all stanzas (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf stop
+------------------------------------------------------------------------------------------------------------------------------------
+
+incr backup - attempt backup when stopped (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+start all stanzas (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start
+------------------------------------------------------------------------------------------------------------------------------------
+
+incr backup - update during backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -46,6 +174,10 @@ db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
+backup-user=[USER-1]
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
 log-level-console=debug
@@ -53,18 +185,35 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:archive-push]
+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
+[db]
+db-cmd=[BACKREST-BIN]
+db-config=[TEST_PATH]/db-master/pgbackrest.conf
+db-host=db-master
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-user=[USER-2]
+
+[global]
 archive-async=y
+db-timeout=45
+lock-path=[TEST_PATH]/backup/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/backup/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/backup/repo

 [global:backup]
 archive-copy=y
 start-fast=y

 restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
@@ -79,3 +228,57 @@ restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-
 ----------------------------------------------------------------
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
 recovery_target_time = '[TIMESTAMP-TARGET-1]'
+
+incr backup - fail on --no-online (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+incr backup - succeed on --no-online with --force (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --force --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
+----------------------------------------------------------
+[db]
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-socket-path=[TEST_PATH]/db-master/db
+
+[global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
+backup-user=[USER-1]
+db-timeout=45
+lock-path=[TEST_PATH]/db-master/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/db-master/log
+protocol-timeout=60
+spool-path=[TEST_PATH]/db-master/spool
+
+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
+[db]
+db-cmd=[BACKREST-BIN]
+db-config=[TEST_PATH]/db-master/pgbackrest.conf
+db-host=db-master
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-user=[USER-2]
+
+[global]
+archive-async=y
+db-timeout=45
+lock-path=[TEST_PATH]/backup/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/backup/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/backup/repo
+
+[global:backup]
+archive-copy=y
+start-fast=y
--- a/test/expect/real-all-005.log
+++ b/test/expect/real-all-005.log
@@ -1,12 +1,12 @@
-run 005 - bkp 0, sby 1, dst db-master, asy 0, cmp 0, s3 0
-=========================================================
+run 005 - bkp 1, sby 1, dst backup, cmp , s3 0
+==============================================

-stanza-create db - main create stanza info files (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
+stanza-create db - main create stanza info files (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
 ------------------------------------------------------------------------------------------------------------------------------------

-full backup - update during backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+full backup - update during backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -15,13 +15,12 @@ full backup - update during backup (db-master host)
 db-path=[TEST_PATH]/db-master/db/base
 db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
-db2-host=db-standby
-db2-path=[TEST_PATH]/db-standby/db/base
-db2-user=[USER-1]

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
+backup-user=[USER-1]
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
@@ -30,13 +29,8 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:backup]
-archive-copy=y
-start-fast=y
-
 + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
 -----------------------------------------------------------
 [db]
@@ -46,8 +40,8 @@ db-socket-path=[TEST_PATH]/db-standby/db

 [global]
 backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/db-master/pgbackrest.conf
-backup-host=db-master
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
 backup-user=[USER-1]
 compress=n
 db-timeout=45
@@ -59,6 +53,37 @@ log-path=[TEST_PATH]/db-standby/log
 protocol-timeout=60
 spool-path=[TEST_PATH]/db-standby/spool

+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
+[db]
+db1-cmd=[BACKREST-BIN]
+db1-config=[TEST_PATH]/db-master/pgbackrest.conf
+db1-host=db-master
+db1-path=[TEST_PATH]/db-master/db/base
+db1-port=[PORT-1]
+db1-user=[USER-2]
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
+db2-host=db-standby
+db2-path=[TEST_PATH]/db-standby/db/base
+db2-port=[PORT-2]
+db2-user=[USER-2]
+
+[global]
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/backup/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/backup/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/backup/repo
+
+[global:backup]
+archive-copy=y
+start-fast=y
+
 restore, type 'default', remap - restore backup on replica (db-standby host)
 > [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --recovery-option=standby_mode=on --recovery-option="primary_conninfo=host=db-master port=6543 user=replicator"  --link-map="pg_xlog=[TEST_PATH]/db-standby/db/pg_xlog" --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -69,8 +94,8 @@ primary_conninfo = 'host=db-master port=6543 user=replicator'
 standby_mode = 'on'
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"'

-full backup - backup from standby (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --retention-full=1 --backup-standby --type=full --stanza=db backup
+full backup - backup from standby (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --retention-full=1 --backup-standby --type=full --stanza=db backup
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -79,13 +104,12 @@ full backup - backup from standby (db-master host)
 db-path=[TEST_PATH]/db-master/db/base
 db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
-db2-host=db-standby
-db2-path=[TEST_PATH]/db-standby/db/base
-db2-user=[USER-1]

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
+backup-user=[USER-1]
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
@@ -94,13 +118,8 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:backup]
-archive-copy=y
-start-fast=y
-
 + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
 -----------------------------------------------------------
 [db]
@@ -112,8 +131,8 @@ db-socket-path=[TEST_PATH]/db-standby/db

 [global]
 backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/db-master/pgbackrest.conf
-backup-host=db-master
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
 backup-user=[USER-1]
 compress=n
 db-timeout=45
@@ -125,12 +144,44 @@ log-path=[TEST_PATH]/db-standby/log
 protocol-timeout=60
 spool-path=[TEST_PATH]/db-standby/spool

+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
+[db]
+db1-cmd=[BACKREST-BIN]
+db1-config=[TEST_PATH]/db-master/pgbackrest.conf
+db1-host=db-master
+db1-path=[TEST_PATH]/db-master/db/base
+db1-port=[PORT-1]
+db1-user=[USER-2]
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
+db2-host=db-standby
+db2-path=[TEST_PATH]/db-standby/db/base
+db2-port=[PORT-2]
+db2-user=[USER-2]
+
+[global]
+archive-async=y
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/backup/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/backup/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/backup/repo
+
+[global:backup]
+archive-copy=y
+start-fast=y
+
 check db - verify check command on standby (db-standby host)
 > [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --log-level-console=detail --stanza=db check
 ------------------------------------------------------------------------------------------------------------------------------------

-incr backup - update during backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+incr backup - update during backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -139,13 +190,12 @@ incr backup - update during backup (db-master host)
 db-path=[TEST_PATH]/db-master/db/base
 db-port=[PORT-1]
 db-socket-path=[TEST_PATH]/db-master/db
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
-db2-host=db-standby
-db2-path=[TEST_PATH]/db-standby/db/base
-db2-user=[USER-1]

 [global]
+backup-cmd=[BACKREST-BIN]
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
+backup-user=[USER-1]
 compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
@@ -154,13 +204,8 @@ log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-master/repo
 spool-path=[TEST_PATH]/db-master/spool

-[global:backup]
-archive-copy=y
-start-fast=y
-
 + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
 -----------------------------------------------------------
 [db]
@@ -172,8 +217,8 @@ db-socket-path=[TEST_PATH]/db-standby/db

 [global]
 backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/db-master/pgbackrest.conf
-backup-host=db-master
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
 backup-user=[USER-1]
 compress=n
 db-timeout=45
@@ -185,8 +230,40 @@ log-path=[TEST_PATH]/db-standby/log
 protocol-timeout=60
 spool-path=[TEST_PATH]/db-standby/spool

+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
+[db]
+db1-cmd=[BACKREST-BIN]
+db1-config=[TEST_PATH]/db-master/pgbackrest.conf
+db1-host=db-master
+db1-path=[TEST_PATH]/db-master/db/base
+db1-port=[PORT-1]
+db1-user=[USER-2]
+db2-cmd=[BACKREST-BIN]
+db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
+db2-host=db-standby
+db2-path=[TEST_PATH]/db-standby/db/base
+db2-port=[PORT-2]
+db2-user=[USER-2]
+
+[global]
+archive-async=y
+compress=n
+db-timeout=45
+lock-path=[TEST_PATH]/backup/lock
+log-level-console=debug
+log-level-file=trace
+log-level-stderr=off
+log-path=[TEST_PATH]/backup/log
+protocol-timeout=60
+repo-path=[TEST_PATH]/backup/repo
+
+[global:backup]
+archive-copy=y
+start-fast=y
+
 restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
--- a/test/expect/real-all-006.log
+++ b/test/expect/real-all-006.log
@@ -1,12 +1,104 @@
-run 006 - bkp 0, sby 1, dst db-standby, asy 0, cmp 0, s3 0
-==========================================================
+run 006 - bkp 1, sby 0, dst backup, cmp 1, s3 1
+===============================================

-stanza-create db - main create stanza info files (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
+stanza-create db - main create stanza info files (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
 ------------------------------------------------------------------------------------------------------------------------------------

-full backup - update during backup (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
+check db - fail on missing archive.info file (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - force create stanza info files (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+full backup - fail on archive_mode=off (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive_mode=off (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive_mode=off (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+full backup - fail on invalid archive_command (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on invalid archive_command (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on invalid archive_command (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive timeout when archive-check=n (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --no-archive-check --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive mismatch after upgrade (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive mismatch after upgrade (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive timeout (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on archive timeout (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on backup info mismatch (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - fail on backup info mismatch (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success after backup (db-master host)
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+check db - verify success after backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - verify success with force (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - fail on database mismatch with directory (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-create db - successfully create stanza files to be upgraded (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create
+------------------------------------------------------------------------------------------------------------------------------------
+
+stanza-upgrade db - upgrade stanza files online (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-upgrade
+------------------------------------------------------------------------------------------------------------------------------------
+
+full backup - update during backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -18,59 +110,53 @@ db-socket-path=[TEST_PATH]/db-master/db

 [global]
 backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/db-standby/pgbackrest.conf
-backup-host=db-standby
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
 backup-user=[USER-1]
-compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
 log-level-console=debug
 log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
+process-max=2
 protocol-timeout=60
 spool-path=[TEST_PATH]/db-master/spool

-+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
-----------------------------------------------------------
+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
 [db]
-db-path=[TEST_PATH]/db-standby/db/base
-db-port=[PORT-2]
-db-socket-path=[TEST_PATH]/db-standby/db
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-master/pgbackrest.conf
-db2-host=db-master
-db2-path=[TEST_PATH]/db-master/db/base
-db2-user=[USER-1]
+db-cmd=[BACKREST-BIN]
+db-config=[TEST_PATH]/db-master/pgbackrest.conf
+db-host=db-master
+db-path=[TEST_PATH]/db-master/db/base
+db-port=[PORT-1]
+db-user=[USER-2]

 [global]
-compress=n
 db-timeout=45
-lock-path=[TEST_PATH]/db-standby/lock
+lock-path=[TEST_PATH]/backup/lock
 log-level-console=debug
 log-level-file=trace
 log-level-stderr=off
-log-path=[TEST_PATH]/db-standby/log
+log-path=[TEST_PATH]/backup/log
+process-max=2
 protocol-timeout=60
-repo-path=[TEST_PATH]/db-standby/repo
-spool-path=[TEST_PATH]/db-standby/spool
+repo-path=/
+repo-s3-bucket=pgbackrest-dev
+repo-s3-endpoint=s3.amazonaws.com
+repo-s3-key=accessKey1
+repo-s3-key-secret=verySecretKey1
+repo-s3-region=us-east-1
+repo-s3-verify-ssl=n
+repo-type=s3

 [global:backup]
 archive-copy=y
 start-fast=y

-restore, type 'default', remap - restore backup on replica (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --recovery-option=standby_mode=on --recovery-option="primary_conninfo=host=db-master port=6543 user=replicator"  --link-map="pg_xlog=[TEST_PATH]/db-standby/db/pg_xlog" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-standby/db/base/recovery.conf
-----------------------------------------------------------------
-primary_conninfo = 'host=db-master port=6543 user=replicator'
-standby_mode = 'on'
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-full backup - backup from standby (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --retention-full=1 --backup-standby --type=full --stanza=db backup
+incr backup - update during backup (backup host)
+> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
@@ -82,126 +168,60 @@ db-socket-path=[TEST_PATH]/db-master/db

 [global]
 backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/db-standby/pgbackrest.conf
-backup-host=db-standby
+backup-config=[TEST_PATH]/backup/pgbackrest.conf
+backup-host=backup
 backup-user=[USER-1]
-compress=n
 db-timeout=45
 lock-path=[TEST_PATH]/db-master/lock
 log-level-console=debug
 log-level-file=trace
 log-level-stderr=off
 log-path=[TEST_PATH]/db-master/log
+process-max=2
 protocol-timeout=60
 spool-path=[TEST_PATH]/db-master/spool

-+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
-----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-standby/db/base
-db-port=[PORT-2]
-db-socket-path=[TEST_PATH]/db-standby/db
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-master/pgbackrest.conf
-db2-host=db-master
-db2-path=[TEST_PATH]/db-master/db/base
-db2-user=[USER-1]
-
-[db:restore]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-standby/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-standby/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/db-standby/repo
-spool-path=[TEST_PATH]/db-standby/spool
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-check db - verify check command on standby (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --log-level-console=detail --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - update during backup (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
+-------------------------------------------------------
 [db]
+db-cmd=[BACKREST-BIN]
+db-config=[TEST_PATH]/db-master/pgbackrest.conf
+db-host=db-master
 db-path=[TEST_PATH]/db-master/db/base
 db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
+db-user=[USER-2]

 [global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/db-standby/pgbackrest.conf
-backup-host=db-standby
-backup-user=[USER-1]
-compress=n
+archive-async=y
 db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
+lock-path=[TEST_PATH]/backup/lock
 log-level-console=debug
 log-level-file=trace
 log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
+log-path=[TEST_PATH]/backup/log
+process-max=2
 protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
-----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-standby/db/base
-db-port=[PORT-2]
-db-socket-path=[TEST_PATH]/db-standby/db
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-master/pgbackrest.conf
-db2-host=db-master
-db2-path=[TEST_PATH]/db-master/db/base
-db2-user=[USER-1]
-
-[db:restore]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-standby/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-standby/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/db-standby/repo
-spool-path=[TEST_PATH]/db-standby/spool
+repo-path=/
+repo-s3-bucket=pgbackrest-dev
+repo-s3-endpoint=s3.amazonaws.com
+repo-s3-key=accessKey1
+repo-s3-key-secret=verySecretKey1
+repo-s3-region=us-east-1
+repo-s3-verify-ssl=n
+repo-type=s3

 [global:backup]
 archive-copy=y
 start-fast=y

 restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
+> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------

 + supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
 ----------------------------------------------------------------
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'

-restore, force, backup '[BACKUP-FULL-1]', type 'immediate' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-FULL-1] --type=immediate --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target = 'immediate'
-
 restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
 ------------------------------------------------------------------------------------------------------------------------------------
--- a/test/expect/real-all-007.log
+++ b/test/expect/real-all-007.log
@@ -1,367 +0,0 @@
-run 007 - bkp 1, sby 0, dst backup, asy 0, cmp 0, s3 0
-======================================================
-
-stanza-create db - main create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on missing archive.info file (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - force create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - fail on archive_mode=off (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive_mode=off (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive_mode=off (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - fail on invalid archive_command (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on invalid archive_command (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on invalid archive_command (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive timeout when archive-check=n (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --no-archive-check --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive mismatch after upgrade (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive mismatch after upgrade (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive timeout (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive timeout (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on backup info mismatch (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on backup info mismatch (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success after backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success after backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - fail on backup info file missing from non-empty dir (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - verify success with force (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - fail on database mismatch with directory (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - successfully create stanza files to be upgraded (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-upgrade db - upgrade stanza files online (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-upgrade
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - fail on backup lock exists (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-stop all stanzas (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf stop
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - attempt backup when stopped (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-start all stanzas (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - fail on archive_mode=always (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - fail on backup already running (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default', expect exit 38 - postmaster running (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-restore, type 'default', expect exit 40 - path not empty (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-restore, force, backup '[BACKUP-FULL-1]', type 'immediate' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-FULL-1] --type=immediate --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target = 'immediate'
-
-restore, force, backup '[BACKUP-INCR-1]', type 'xid', target '[XID-TARGET-1]', target-action=promote (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-INCR-1] --tablespace-map-all=../../tablespace  --type=xid --target="[XID-TARGET-1]" --link-all --target-action=promote --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_xid = '[XID-TARGET-1]'
-recovery_target_action = 'promote'
-
-restore, type 'preserve' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --type=preserve --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_xid = '[XID-TARGET-1]'
-recovery_target_action = 'promote'
-
-restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_time = '[TIMESTAMP-TARGET-1]'
-
-restore delta, backup '[BACKUP-INCR-1]', type 'xid', target '[XID-TARGET-1]', exclusive (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-INCR-1] --type=xid --target="[XID-TARGET-1]" --target-exclusive --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_xid = '[XID-TARGET-1]'
-recovery_target_inclusive = 'false'
-
-restore delta, force, type 'name', target 'backrest' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --type=name --target="backrest" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_name = 'backrest'
-
-restore delta, backup '[BACKUP-INCR-1]', type 'default', timeline '4' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-INCR-1] --target-timeline="4" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-standby_mode = 'on'
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_timeline = '4'
-
-incr backup - fail on --no-online (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - succeed on --no-online with --force (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --force --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-recovery-option=standby-mode=on
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
--- a/test/expect/real-all-008.log
+++ b/test/expect/real-all-008.log
@@ -1,121 +0,0 @@
-run 008 - bkp 1, sby 0, dst backup, asy 0, cmp 1, s3 0
-======================================================
-
-stanza-create db - main create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-incr backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_time = '[TIMESTAMP-TARGET-1]'
--- a/test/expect/real-all-009.log
+++ b/test/expect/real-all-009.log
@@ -1,131 +0,0 @@
-run 009 - bkp 1, sby 0, dst backup, asy 1, cmp 0, s3 0
-======================================================
-
-stanza-create db - main create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-incr backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_time = '[TIMESTAMP-TARGET-1]'
--- a/test/expect/real-all-010.log
+++ b/test/expect/real-all-010.log
@@ -1,127 +0,0 @@
-run 010 - bkp 1, sby 0, dst backup, asy 1, cmp 1, s3 0
-======================================================
-
-stanza-create db - main create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-incr backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_time = '[TIMESTAMP-TARGET-1]'
--- a/test/expect/real-all-011.log
+++ b/test/expect/real-all-011.log
@@ -1,287 +0,0 @@
-run 011 - bkp 1, sby 1, dst backup, asy 0, cmp 0, s3 0
-======================================================
-
-stanza-create db - main create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
-----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-standby/db/base
-db-port=[PORT-2]
-db-socket-path=[TEST_PATH]/db-standby/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-standby/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-standby/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-standby/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db1-cmd=[BACKREST-BIN]
-db1-config=[TEST_PATH]/db-master/pgbackrest.conf
-db1-host=db-master
-db1-path=[TEST_PATH]/db-master/db/base
-db1-port=[PORT-1]
-db1-user=[USER-2]
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
-db2-host=db-standby
-db2-path=[TEST_PATH]/db-standby/db/base
-db2-port=[PORT-2]
-db2-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default', remap - restore backup on replica (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf  --recovery-option=standby_mode=on --recovery-option="primary_conninfo=host=db-master port=6543 user=replicator"  --link-map="pg_xlog=[TEST_PATH]/db-standby/db/pg_xlog" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-standby/db/base/recovery.conf
-----------------------------------------------------------------
-primary_conninfo = 'host=db-master port=6543 user=replicator'
-standby_mode = 'on'
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-full backup - backup from standby (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --retention-full=1 --backup-standby --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
-----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-standby/db/base
-db-port=[PORT-2]
-db-socket-path=[TEST_PATH]/db-standby/db
-
-[db:restore]
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-standby/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-standby/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-standby/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db1-cmd=[BACKREST-BIN]
-db1-config=[TEST_PATH]/db-master/pgbackrest.conf
-db1-host=db-master
-db1-path=[TEST_PATH]/db-master/db/base
-db1-port=[PORT-1]
-db1-user=[USER-2]
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
-db2-host=db-standby
-db2-path=[TEST_PATH]/db-standby/db/base
-db2-port=[PORT-2]
-db2-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-check db - verify check command on standby (db-standby host)
-> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --log-level-console=detail --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-+ supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf
-----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-standby/db/base
-db-port=[PORT-2]
-db-socket-path=[TEST_PATH]/db-standby/db
-
-[db:restore]
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/db-standby/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-standby/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-standby/spool
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db1-cmd=[BACKREST-BIN]
-db1-config=[TEST_PATH]/db-master/pgbackrest.conf
-db1-host=db-master
-db1-path=[TEST_PATH]/db-master/db/base
-db1-port=[PORT-1]
-db1-user=[USER-2]
-db2-cmd=[BACKREST-BIN]
-db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
-db2-host=db-standby
-db2-path=[TEST_PATH]/db-standby/db/base
-db2-port=[PORT-2]
-db2-user=[USER-2]
-
-[global]
-compress=n
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=[TEST_PATH]/backup/repo
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-restore, force, backup '[BACKUP-FULL-1]', type 'immediate' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-FULL-1] --type=immediate --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target = 'immediate'
-
-restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_time = '[TIMESTAMP-TARGET-1]'
--- a/test/expect/real-all-012.log
+++ b/test/expect/real-all-012.log
@@ -1,387 +0,0 @@
-run 012 - bkp 1, sby 0, dst backup, asy 1, cmp 1, s3 1
-======================================================
-
-stanza-create db - main create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on missing archive.info file (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - force create stanza info files (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - fail on archive_mode=off (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive_mode=off (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive_mode=off (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - fail on invalid archive_command (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on invalid archive_command (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on invalid archive_command (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive timeout when archive-check=n (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --no-archive-check --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive mismatch after upgrade (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive mismatch after upgrade (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive timeout (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on archive timeout (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=0.1 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on backup info mismatch (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - fail on backup info mismatch (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success after backup (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-check db - verify success after backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --archive-timeout=5 --stanza=db check
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - verify success with force (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --force stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - fail on database mismatch with directory (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-create db - successfully create stanza files to be upgraded (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail  --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create
------------------------------------------------------------------------------------------------------------------------------------
-
-stanza-upgrade db - upgrade stanza files online (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-upgrade
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - fail on backup lock exists (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --type=full --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-full backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf  --buffer-size=16384 --type=full --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=/
-repo-s3-bucket=pgbackrest-dev
-repo-s3-endpoint=s3.amazonaws.com
-repo-s3-key=accessKey1
-repo-s3-key-secret=verySecretKey1
-repo-s3-region=us-east-1
-repo-s3-verify-ssl=n
-repo-type=s3
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-stop all stanzas (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf stop
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - attempt backup when stopped (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-start all stanzas (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - fail on archive_mode=always (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - fail on backup already running (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - update during backup (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stop-auto --no-archive-check --buffer-size=32768 --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=/
-repo-s3-bucket=pgbackrest-dev
-repo-s3-endpoint=s3.amazonaws.com
-repo-s3-key=accessKey1
-repo-s3-key-secret=verySecretKey1
-repo-s3-region=us-east-1
-repo-s3-verify-ssl=n
-repo-type=s3
-
-[global:backup]
-archive-copy=y
-start-fast=y
-
-restore, type 'default', expect exit 38 - postmaster running (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-restore, type 'default', expect exit 40 - path not empty (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-restore, type 'default' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf  --db-include=test1  --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-
-restore, force, backup '[BACKUP-FULL-1]', type 'immediate' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-FULL-1] --type=immediate --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target = 'immediate'
-
-restore, force, backup '[BACKUP-INCR-1]', type 'xid', target '[XID-TARGET-1]', target-action=promote (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --set=[BACKUP-INCR-1] --tablespace-map-all=../../tablespace  --type=xid --target="[XID-TARGET-1]" --link-all --target-action=promote --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_xid = '[XID-TARGET-1]'
-recovery_target_action = 'promote'
-
-restore, type 'preserve' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --type=preserve --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_xid = '[XID-TARGET-1]'
-recovery_target_action = 'promote'
-
-restore delta, backup '[BACKUP-FULL-1]', type 'time', target '[TIMESTAMP-TARGET-1]' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-1] --type=time --target="[TIMESTAMP-TARGET-1]" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_time = '[TIMESTAMP-TARGET-1]'
-
-restore delta, backup '[BACKUP-INCR-1]', type 'xid', target '[XID-TARGET-1]', exclusive (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-INCR-1] --type=xid --target="[XID-TARGET-1]" --target-exclusive --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_xid = '[XID-TARGET-1]'
-recovery_target_inclusive = 'false'
-
-restore delta, force, type 'name', target 'backrest' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --type=name --target="backrest" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_name = 'backrest'
-
-restore delta, backup '[BACKUP-INCR-1]', type 'default', timeline '4' (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-INCR-1] --target-timeline="4" --link-all --stanza=db restore
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/db/base/recovery.conf
----------------------------------------------------------------
-standby_mode = 'on'
-restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
-recovery_target_timeline = '4'
-
-incr backup - fail on --no-online (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-incr backup - succeed on --no-online with --force (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --force --stanza=db backup
------------------------------------------------------------------------------------------------------------------------------------
-
-+ supplemental file: [TEST_PATH]/db-master/pgbackrest.conf
----------------------------------------------------------
-[db]
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-socket-path=[TEST_PATH]/db-master/db
-recovery-option=standby-mode=on
-
-[global]
-backup-cmd=[BACKREST-BIN]
-backup-config=[TEST_PATH]/backup/pgbackrest.conf
-backup-host=backup
-backup-user=[USER-1]
-db-timeout=45
-lock-path=[TEST_PATH]/db-master/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/db-master/log
-protocol-timeout=60
-spool-path=[TEST_PATH]/db-master/spool
-
-[global:archive-push]
-archive-async=y
-
-+ supplemental file: [TEST_PATH]/backup/pgbackrest.conf
-------------------------------------------------------
-[db]
-db-cmd=[BACKREST-BIN]
-db-config=[TEST_PATH]/db-master/pgbackrest.conf
-db-host=db-master
-db-path=[TEST_PATH]/db-master/db/base
-db-port=[PORT-1]
-db-user=[USER-2]
-
-[global]
-db-timeout=45
-lock-path=[TEST_PATH]/backup/lock
-log-level-console=debug
-log-level-file=trace
-log-level-stderr=off
-log-path=[TEST_PATH]/backup/log
-protocol-timeout=60
-repo-path=/
-repo-s3-bucket=pgbackrest-dev
-repo-s3-endpoint=s3.amazonaws.com
-repo-s3-key=accessKey1
-repo-s3-key-secret=verySecretKey1
-repo-s3-region=us-east-1
-repo-s3-verify-ssl=n
-repo-type=s3
-
-[global:backup]
-archive-copy=y
-start-fast=y
--- a/test/lib/pgBackRestTest/Common/CiTest.pm
+++ b/test/lib/pgBackRestTest/Common/CiTest.pm
@@ -93,48 +93,9 @@ sub process
    # Iterate each OS
    foreach my $strVm (VM_LIST)
    {
-        my $hVm = vmGet();
-        my @stryModule;
-        my $strRealModule = undef;
-
-        # Get all modules but full to break up the tests
-        foreach my $strModule (testDefModuleList())
-        {
-            if ($strModule ne 'real')
-            {
-                push(@stryModule, $strModule);
-            }
-            else
-            {
-                $strRealModule = $strModule;
-            }
-        }
-
-        # Add config options for tests that are not the very first one
-        my $strConfigNotFirst = '--no-lint';
-        my $strConfigNotFirstOS = '--no-package';
-
        $strConfig .=
-            "  - PGB_TEST_VM=\"${strVm}\" PGB_BUILD_PARAM=\"--db=none\" PGB_TEST_PARAM=\"--vm-max=2 --module=" .
-                join(' --module=', @stryModule) . ($bFirst ? '' : " ${strConfigNotFirst}") . "\"\n";
+            "  - PGB_TEST_VM=\"${strVm}\" PGB_TEST_PARAM=\"" . ($bFirst ? '' : " --no-lint") . "\"\n";
        $bFirst = false;
-
-        # Now generate real tests
-        if (!defined($strRealModule))
-        {
-            confess "${strRealModule} module not found, has the name changed?";
-        }
-
-        foreach my $strTest (testDefModuleTestList($strRealModule))
-        {
-            foreach my $strDbVersion (sort {$b cmp $a} @{$hVm->{$strVm}{&VM_DB_MINIMAL}})
-            {
-                $strConfig .=
-                    "  - PGB_TEST_VM=\"${strVm}\" PGB_BUILD_PARAM=\"--db=${strDbVersion}\"" .
-                        " PGB_TEST_PARAM=\"--module=${strRealModule} --db=${strDbVersion}" .
-                        " --process-max=2 ${strConfigNotFirst} ${strConfigNotFirstOS}\"\n";
-            }
-        }
    }

    # Configure install and script
@@ -167,7 +128,7 @@ sub process
        "    cd ~ && pwd && whoami && umask && groups\n" .
        "    mv \${TRAVIS_BUILD_DIR?} " . BACKREST_EXE . "\n" .
        "    rm -rf \${TRAVIS_BUILD_DIR?}\n" .
-        "  - " . BACKREST_EXE . "/test/test.pl --vm-build --vm=\${PGB_TEST_VM?} \${PGB_BUILD_PARAM?}\n" .
+        "  - " . BACKREST_EXE . "/test/test.pl --vm-build --vm=\${PGB_TEST_VM?}\n" .
        "\n" .
        "script:\n" .
        "  - " . BACKREST_EXE . "/test/test.pl --vm-host=u14 --vm=\${PGB_TEST_VM?} \${PGB_TEST_PARAM?}\n";
--- a/test/lib/pgBackRestTest/Common/DefineTest.pm
+++ b/test/lib/pgBackRestTest/Common/DefineTest.pm
@@ -414,13 +414,12 @@ my $oTestDef =
            &TESTDEF_NAME => 'real',
            &TESTDEF_EXPECT => true,
            &TESTDEF_INDIVIDUAL => true,
-            &TESTDEF_PROCESS => true,

            &TESTDEF_TEST =>
            [
                {
                    &TESTDEF_NAME => 'all',
-                    &TESTDEF_TOTAL => 12,
+                    &TESTDEF_TOTAL => 6,
                    &TESTDEF_DB => true,
                }
            ]
--- a/test/lib/pgBackRestTest/Common/VmTest.pm
+++ b/test/lib/pgBackRestTest/Common/VmTest.pm
@@ -140,7 +140,6 @@ my $oyVm =

        &VM_DB_MINIMAL =>
        [
-            PG_VERSION_95,
            PG_VERSION_96,
        ],
    },
@@ -262,6 +261,7 @@ my $oyVm =
        &VM_DB_MINIMAL =>
        [
            PG_VERSION_94,
+            PG_VERSION_95,
        ],
    },
 };
--- a/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm
+++ b/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm
@@ -28,13 +28,14 @@ use pgBackRest::Protocol::Storage::Helper;
 use pgBackRest::Version;

 use pgBackRestTest::Common::ContainerTest;
-use pgBackRestTest::Env::HostEnvTest;
 use pgBackRestTest::Common::ExecuteTest;
 use pgBackRestTest::Common::FileTest;
 use pgBackRestTest::Common::RunTest;
+use pgBackRestTest::Common::VmTest;
 use pgBackRestTest::Env::Host::HostBaseTest;
 use pgBackRestTest::Env::Host::HostBackupTest;
 use pgBackRestTest::Env::Host::HostDbTest;
+use pgBackRestTest::Env::HostEnvTest;

 ####################################################################################################################################
 # run
@@ -47,35 +48,63 @@ sub run
    {
    foreach my $bHostBackup ($bS3 ? (true) : (false, true))
    {
+    # Standby should only be tested for pg versions that support it
    foreach my $bHostStandby ($bS3 ? (false) : (false, true))
    {
+    # Master and standby backup destinations on need to be tested on one db version since it is not version specific
    foreach my $strBackupDestination (
        $bS3 || $bHostBackup ? (HOST_BACKUP) : $bHostStandby ? (HOST_DB_MASTER, HOST_DB_STANDBY) : (HOST_DB_MASTER))
    {
-    foreach my $bArchiveAsync ($bS3 ? (true) : ($bHostStandby ? (false) : (false, true)))
-    {
-    foreach my $bCompress ($bS3 ? (true) : ($bHostStandby ? (false) : (false, true)))
-    {
+        my $bCompress = $bHostBackup && !$bHostStandby;
+
        # Increment the run, log, and decide whether this unit test should be run
        next if (!$self->begin(
-            "bkp ${bHostBackup}, sby ${bHostStandby}, dst ${strBackupDestination}, asy ${bArchiveAsync}, cmp ${bCompress}," .
-                " s3 ${bS3}",
-            $self->processMax() == 1 && $self->pgVersion() eq PG_VERSION_95));
+            "bkp ${bHostBackup}, sby ${bHostStandby}, dst ${strBackupDestination}, cmp ${bCompress}, s3 ${bS3}",
+            $self->processMax() == 1 && $self->pgVersion() eq PG_VERSION_96));

+        # Skip when s3 and host backup tests when there is more than one version of pg being tested and this is not the last one
+        my $hyVm = vmGet();
+
+        if (($bS3 || $bHostBackup) &&
+            (@{$hyVm->{$self->vm()}{&VM_DB_MINIMAL}} > 1 && ${$hyVm->{$self->vm()}{&VM_DB_MINIMAL}}[-1] ne $self->pgVersion()))
+        {
+            &log(INFO,
+                'skipped - this test will be run for this OS using PG ' . ${$hyVm->{$self->vm()}{&VM_DB_MINIMAL}}[-1]);
+            next;
+        }
+
+        # Skip hot standby tests if the system does not support hot standby
        if ($bHostStandby && $self->pgVersion() < PG_VERSION_HOT_STANDBY)
        {
            &log(INFO, 'skipped - this version of PostgreSQL does not support hot standby');
            next;
        }

+        # Skip backup destinations other than backup host when standby except for one arbitrary db version
+        if ($bHostStandby && $strBackupDestination ne HOST_BACKUP && $self->pgVersion() ne PG_VERSION_96)
+        {
+            &log(INFO, 'skipped - standby with backup destination other than backup host only tested on PG ' . PG_VERSION_96);
+            next;
+        }
+
        # Create hosts, file object, and config
        my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(
            false, $self->expect(),
            {bHostBackup => $bHostBackup, bStandby => $bHostStandby, strBackupDestination => $strBackupDestination,
-             bCompress => $bCompress, bArchiveAsync => $bArchiveAsync, bS3 => $bS3});
+             bCompress => $bCompress, bArchiveAsync => false, bS3 => $bS3});

-        # Determine if extra tests are performed.  Extra tests should not be primary tests for compression or async archiving.
-        my $bTestExtra = $self->runCurrent() == 1 || $self->runCurrent() == 7 || $self->runCurrent() == 12;
+        # Only perform extra tests on certain runs to save time
+        my $bTestLocal = $self->runCurrent() == 1;
+        my $bTestExtra =
+            $bTestLocal || $self->runCurrent() == 4 || ($self->runCurrent() == 6 && $self->pgVersion() eq PG_VERSION_96);
+
+        # If S3 set process max to 2.  This seems like the best place for parallel testing since it will help speed S3 processing
+        # without slowing down the other tests too much.
+        if ($bS3)
+        {
+            $oHostBackup->configUpdate({&CONFIG_SECTION_GLOBAL => {&OPTION_PROCESS_MAX => 2}});
+            $oHostDbMaster->configUpdate({&CONFIG_SECTION_GLOBAL => {&OPTION_PROCESS_MAX => 2}});
+        }

        $oHostDbMaster->clusterCreate();

@@ -108,8 +137,11 @@ sub run
        my $strTimelineMessage = 'timeline3';

        # Create two new databases
-        $oHostDbMaster->sqlExecute('create database test1', {bAutoCommit => true});
-        $oHostDbMaster->sqlExecute('create database test2', {bAutoCommit => true});
+        if ($bTestLocal)
+        {
+            $oHostDbMaster->sqlExecute('create database test1', {bAutoCommit => true});
+            $oHostDbMaster->sqlExecute('create database test2', {bAutoCommit => true});
+        }

        # Test check command and stanza create
        #---------------------------------------------------------------------------------------------------------------------------
@@ -335,7 +367,7 @@ sub run
        $oHostDbMaster->sqlXlogRotate();
        $oHostDbMaster->sqlExecute("insert into test values ('$strDefaultMessage')");

-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            # Acquire the backup advisory lock so it looks like a backup is running
            if (!$oHostDbMaster->sqlSelectOne('select pg_try_advisory_lock(' . DB_BACKUP_ADVISORY_LOCK . ')'))
@@ -364,9 +396,12 @@ sub run

        my $strFullBackup = $oHostBackup->backupEnd($strType, $oExecuteBackup);

+        # Enabled async archiving
+        $oHostBackup->configUpdate({&CONFIG_SECTION_GLOBAL => {&OPTION_ARCHIVE_ASYNC => 'y'}});
+
        # Kick out a bunch of archive logs to excercise async archiving.  Only do this when compressed and remote to slow it
        # down enough to make it evident that the async process is working.
-        if ($bArchiveAsync && $bCompress && $strBackupDestination eq HOST_BACKUP)
+        if ($bTestExtra && $bCompress && $strBackupDestination eq HOST_BACKUP)
        {
            &log(INFO, '    multiple pg_switch_xlog() to exercise async archiving');
            $oHostDbMaster->sqlExecute("create table xlog_activity (id int)");
@@ -444,7 +479,7 @@ sub run
        #---------------------------------------------------------------------------------------------------------------------------
        # Restart the cluster to check for any errors before continuing since the stop tests will definitely create errors and
        # the logs will to be deleted to avoid causing issues further down the line.
-        if ($bTestExtra)
+        if ($bTestExtra && !$bS3)
        {
            $strType = BACKUP_TYPE_INCR;

@@ -466,7 +501,7 @@ sub run

        # Incr backup - fail on archive_mode=always when version >= 9.5
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra && $oHostDbMaster->pgVersion() >= PG_VERSION_95)
+        if ($bTestLocal && $oHostDbMaster->pgVersion() >= PG_VERSION_95)
        {
            $strType = BACKUP_TYPE_INCR;

@@ -504,7 +539,7 @@ sub run

        # Start a backup so the next backup has to restart it.  This test is not required for PostgreSQL >= 9.6 since backups
        # are run in non-exlusive mode.
-        if ($bTestExtra && $oHostDbMaster->pgVersion() >= PG_VERSION_93 && $oHostDbMaster->pgVersion() < PG_VERSION_96)
+        if ($bTestLocal && $oHostDbMaster->pgVersion() >= PG_VERSION_93 && $oHostDbMaster->pgVersion() < PG_VERSION_96)
        {
            $oHostDbMaster->sqlSelectOne("select pg_start_backup('test backup that will cause an error', true)");

@@ -550,7 +585,7 @@ sub run
        #---------------------------------------------------------------------------------------------------------------------------
        my $strXidTarget = undef;

-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            $oHostDbMaster->sqlExecute("update test set message = '$strXidMessage'", {bCommit => false});
            $oHostDbMaster->sqlXlogRotate();
@@ -563,7 +598,7 @@ sub run
        #---------------------------------------------------------------------------------------------------------------------------
        my $strNameTarget = 'backrest';

-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            $oHostDbMaster->sqlExecute("update test set message = '$strNameMessage'", {bCommit => true});
            $oHostDbMaster->sqlXlogRotate();
@@ -578,13 +613,16 @@ sub run

        # Create a table and data in database test2
        #---------------------------------------------------------------------------------------------------------------------------
-        $oHostDbMaster->sqlExecute(
-            'create table test (id int);' .
-            'insert into test values (1);' .
-            'create table test_ts1 (id int) tablespace ts1;' .
-            'insert into test_ts1 values (2);',
-            {strDb => 'test2', bAutoCommit => true});
-        $oHostDbMaster->sqlXlogRotate();
+        if ($bTestLocal)
+        {
+            $oHostDbMaster->sqlExecute(
+                'create table test (id int);' .
+                'insert into test values (1);' .
+                'create table test_ts1 (id int) tablespace ts1;' .
+                'insert into test_ts1 values (2);',
+                {strDb => 'test2', bAutoCommit => true});
+            $oHostDbMaster->sqlXlogRotate();
+        }

        # Restore (type = default)
        #---------------------------------------------------------------------------------------------------------------------------
@@ -599,9 +637,7 @@ sub run
        $strComment = undef;
        $iExpectedExitStatus = undef;

-            # &log(INFO, "    testing recovery type = ${strType}");
-
-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            # Expect failure because postmaster.pid exists
            $strComment = 'postmaster running';
@@ -614,7 +650,7 @@ sub run

        $oHostDbMaster->clusterStop();

-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            # Expect failure because db path is not empty
            $strComment = 'path not empty';
@@ -639,13 +675,17 @@ sub run

        $oHostDbMaster->restore(
            OPTION_DEFAULT_RESTORE_SET, undef, undef, $bDelta, $bForce, $strType, $strTarget, $bTargetExclusive,
-            $strTargetAction, $strTargetTimeline, $oRecoveryHashRef, $strComment, $iExpectedExitStatus, ' --db-include=test1');
+            $strTargetAction, $strTargetTimeline, $oRecoveryHashRef, $strComment, $iExpectedExitStatus,
+            $bTestLocal ? ' --db-include=test1' : undef);

        $oHostDbMaster->clusterStart();
-        $oHostDbMaster->sqlSelectOneTest('select message from test', $bTestExtra ? $strNameMessage : $strIncrMessage);
+        $oHostDbMaster->sqlSelectOneTest('select message from test', $bTestLocal ? $strNameMessage : $strIncrMessage);

        # Now it should be OK to drop database test2
-        $oHostDbMaster->sqlExecute('drop database test2', {bAutoCommit => true});
+        if ($bTestLocal)
+        {
+            $oHostDbMaster->sqlExecute('drop database test2', {bAutoCommit => true});
+        }

        # The test table lives in ts1 so it needs to be moved or dropped
        if ($oHostDbMaster->pgVersion() >= PG_VERSION_90)
@@ -663,7 +703,7 @@ sub run

        # Restore (restore type = immediate, inclusive)
        #---------------------------------------------------------------------------------------------------------------------------
-        if (($bTestExtra || $bHostStandby) && $oHostDbMaster->pgVersion() >= PG_VERSION_94)
+        if (($bTestLocal || $bHostStandby) && $oHostDbMaster->pgVersion() >= PG_VERSION_94)
        {
            $bDelta = false;
            $bForce = true;
@@ -691,7 +731,7 @@ sub run

        # Restore (restore type = xid, inclusive)
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            $bDelta = false;
            $bForce = true;
@@ -728,7 +768,7 @@ sub run

        # Restore (restore type = preserve, inclusive)
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            $bDelta = false;
            $bForce = false;
@@ -789,7 +829,7 @@ sub run

        # Restore (restore type = xid, exclusive)
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra)
+        if ($bTestLocal)
        {
            $bDelta = true;
            $bForce = false;
@@ -816,7 +856,7 @@ sub run

        # Restore (restore type = name)
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra && $oHostDbMaster->pgVersion() >= PG_VERSION_91)
+        if ($bTestLocal && $oHostDbMaster->pgVersion() >= PG_VERSION_91)
        {
            $bDelta = true;
            $bForce = true;
@@ -843,7 +883,7 @@ sub run

        # Restore (restore type = default, timeline = 3)
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra && $oHostDbMaster->pgVersion() >= PG_VERSION_84)
+        if ($bTestLocal && $oHostDbMaster->pgVersion() >= PG_VERSION_84)
        {
            $bDelta = true;
            $bForce = false;
@@ -879,7 +919,7 @@ sub run

        # Test no-online backups
        #---------------------------------------------------------------------------------------------------------------------------
-        if ($bTestExtra)
+        if ($bTestExtra & !$bS3)
        {
            # Create a postmaster.pid file so it appears that the server is running
            storageTest()->put($oHostDbMaster->dbBasePath() . '/postmaster.pid', '99999');
@@ -900,8 +940,8 @@ sub run
                $strType, 'succeed on --no-' . OPTION_ONLINE . ' with --' . OPTION_FORCE,
                {strOptionalParam => '--no-' . OPTION_ONLINE . ' --' . OPTION_FORCE});
        }
-    }
-    }
+    # }
+    # }
    }
    }
    }
--- a/test/test.pl
+++ b/test/test.pl
@@ -78,7 +78,7 @@ test.pl [options]
   --no-package         do not build packages
   --no-ci-config       don't overwrite the current continuous integration config
   --dev                --no-lint --smart --no-package --process-max=1
-   --expect             --no-lint --smart --no-package --process-max=1 --vm=co7 --db=9.5 --log-force
+   --expect             --no-lint --smart --no-package --process-max=1 --vm=co7 --db=9.6 --log-force

 Configuration Options:
   --psql-bin           path to the psql executables (e.g. /usr/lib/postgresql/9.3/bin/)
@@ -210,7 +210,7 @@ eval
        $bNoPackage = true;
        $iProcessMax = 1;
        $strVm = VM_CO7;
-        $strDbVersion = '9.5';
+        $strDbVersion = '9.6';
        $bLogForce = true;
    }