Commit90102bb

committed

pg_basebackup: Add tests for -X option

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>

1 parent36dc30a commit90102bbCopy full SHA for 90102bb

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`use warnings;`
`3`	`3`	`use Cwd;`
`4`	`4`	`use TestLib;`
`5`		`-use Test::Moretests=>39;`
	`5`	`+use Test::Moretests=>44;`
`6`	`6`
`7`	`7`	`program_help_ok('pg_basebackup');`
`8`	`8`	`program_version_ok('pg_basebackup');`
`@@ -46,6 +46,10 @@`
`46`	`46`	`'pg_basebackup runs');`
`47`	`47`	`ok(-f"$tempdir/backup/PG_VERSION",'backup was created');`
`48`	`48`
	`49`	`+is_deeply([sort(slurp_dir("$tempdir/backup/pg_xlog/"))],`
	`50`	`+ [sortqw(. .. archive_status)],`
	`51`	`+'no WAL files copied');`
	`52`	`+`
`49`	`53`	`command_ok(`
`50`	`54`	`['pg_basebackup','-D',"$tempdir/backup2",'--xlogdir',`
`51`	`55`	`"$tempdir/xlog2" ],`
`@@ -145,3 +149,10 @@`
`145`	`149`	`my$recovery_conf = slurp_file"$tempdir/backupR/recovery.conf";`
`146`	`150`	`like($recovery_conf,qr/^standby_mode = 'on'$/m,'recovery.conf sets standby_mode');`
`147`	`151`	`like($recovery_conf,qr/^primary_conninfo = '.port=$ENV{PGPORT}.'$/m,'recovery.conf sets primary_conninfo');`
	`152`	`+`
	`153`	`+command_ok(['pg_basebackup','-D',"$tempdir/backupxf",'-X','fetch' ],`
	`154`	`+'pg_basebackup -X fetch runs');`
	`155`	`+ok(grep(/^[0-9A-F]{24}$/, slurp_dir("$tempdir/backupxf/pg_xlog")),'WAL files copied');`
	`156`	`+command_ok(['pg_basebackup','-D',"$tempdir/backupxs",'-X','stream' ],`
	`157`	`+'pg_basebackup -X stream runs');`
	`158`	`+ok(grep(/^[0-9A-F]{24}$/, slurp_dir("$tempdir/backupxf/pg_xlog")),'WAL files copied');`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ our @EXPORT = qw(`
`11`	`11`	`start_test_server`
`12`	`12`	`restart_test_server`
`13`	`13`	`psql`
	`14`	`+ slurp_dir`
`14`	`15`	`slurp_file`
`15`	`16`	`system_or_bail`
`16`	`17`	`system_log`
`@@ -176,6 +177,15 @@ sub psql`
`176`	`177`	`run ['psql','-X','-q','-d',$dbname,'-f','-' ],'<', \$sqlordie;`
`177`	`178`	`}`
`178`	`179`
	`180`	`+subslurp_dir`
	`181`	`+{`
	`182`	`+my ($dir) =@_;`
	`183`	`+opendir(my$dh,$dir)ordie;`
	`184`	`+my@direntries =readdir$dh;`
	`185`	`+closedir$dh;`
	`186`	`+return@direntries;`
	`187`	`+}`
	`188`	`+`
`179`	`189`	`subslurp_file`
`180`	`190`	`{`
`181`	`191`	`local$/;`

Comments

(0)