Adapt output of regressions with new options and "show" output

Michael Paquier · Michael Paquier · commit 9e35dd0d4714 · 2013-12-13T00:57:54.000+09:00
Because of that two regression tests were failing:
- option
- show_validate
diff --git a/expected/option.out b/expected/option.out
@@ -6,7 +6,6 @@ Usage:
   pg_rman OPTION backup
   pg_rman OPTION restore
   pg_rman OPTION show [DATE]
-  pg_rman OPTION show timeline [DATE]
   pg_rman OPTION validate [DATE]
   pg_rman OPTION delete DATE
 
@@ -16,6 +15,7 @@ Common Options:
   -S, --srvlog-path=PATH    location of server log storage area
   -B, --backup-path=PATH    location of the backup storage area
   -c, --check               show what would have been done
+  -v, --verbose             output process information
 
 Backup options:
   -b, --backup-mode=MODE    full, incremental, or archive
diff --git a/expected/show_validate.out b/expected/show_validate.out
@@ -2,12 +2,12 @@
 \! rm -rf ${PWD}/results/sample_backup
 \! cp -rp data/sample_backup ${PWD}/results/sample_backup
 \! pg_rman show -B ${PWD}/results/sample_backup
-============================================================================
-Start                Time   Total    Data     WAL     Log  Backup   Status  
-============================================================================
-2009-06-03 17:05:53    0m    ----    ----    ----    ----    ----   RUNNING
-2009-06-01 17:05:53    3m    ----  9223PB    16MB    ----   162MB   DONE
-2009-05-31 17:05:53    3m  1242MB    ----  9223PB    ----   242MB   DONE
+===========================================================================================================
+Start                Mode  Current TLI  Parent TLI  Time   Total    Data     WAL     Log  Backup   Status  
+===========================================================================================================
+2009-06-03 17:05:53  FULL            1           0    0m    ----    ----    ----    ----    ----   RUNNING
+2009-06-01 17:05:53  INCR            1           0    3m    ----  9223PB    16MB    ----   162MB   DONE
+2009-05-31 17:05:53  FULL            1           0    3m  1242MB    ----  9223PB    ----   242MB   DONE
 \! pg_rman validate -B ${PWD}/results/sample_backup 2009-05-31 17:05:53 --debug
 INFO: validate: 2009-05-31 17:05:53 backup and archive log files by CRC
 LOG: database files...
@@ -22,13 +22,13 @@ WARNING: CRC of backup file "PG_VERSION" must be 0 but FEF71BC1
 LOG: archive WAL files...
 WARNING: backup 2009-06-01 17:05:53 is corrupted
 \! pg_rman show -a -B ${PWD}/results/sample_backup
-============================================================================
-Start                Time   Total    Data     WAL     Log  Backup   Status  
-============================================================================
-2009-06-03 17:05:53    0m    ----    ----    ----    ----    ----   RUNNING
-2009-06-02 17:05:03    0m    ----    ----    ----  4335kB   162MB   DELETED
-2009-06-01 17:05:53    3m    ----  9223PB    16MB    ----   162MB   CORRUPT
-2009-05-31 17:05:53    3m  1242MB    ----  9223PB    ----   242MB   OK
+===========================================================================================================
+Start                Mode  Current TLI  Parent TLI  Time   Total    Data     WAL     Log  Backup   Status  
+===========================================================================================================
+2009-06-03 17:05:53  FULL            1           0    0m    ----    ----    ----    ----    ----   RUNNING
+2009-06-02 17:05:03  ARCH            1           0    0m    ----    ----    ----  4335kB   162MB   DELETED
+2009-06-01 17:05:53  INCR            1           0    3m    ----  9223PB    16MB    ----   162MB   CORRUPT
+2009-05-31 17:05:53  FULL            1           0    3m  1242MB    ----  9223PB    ----   242MB   OK
 \! pg_rman show 2009-06-01 17:05:53 -B ${PWD}/results/sample_backup
 # configuration
 BACKUP_MODE=INCREMENTAL
