db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-25 22:12:03 +02:00
Code Issues Releases Activity

Store recovery file name in integration when testing preserve recovery.

Browse Source 
This makes the test a little more maintainable and is friendly with the changes needed for PostgreSQL 12.
This commit is contained in:
David Steele
2019-09-27 10:27:07 -04:00
parent 80eb561caf
commit 833d0da0d9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/pgBackRestTest/Module/Real/RealAllTest.pm
View File

@@ -856,6 +856,8 @@ sub run
# Restore (restore type = xid, inclusive) # Restore (restore type = xid, inclusive)
#--------------------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------------------
my $strRecoveryFile = undef;
if ($bTestLocal) if ($bTestLocal)
{ {
&log(INFO, ' testing recovery type = ' . CFGOPTVAL_RESTORE_TYPE_XID); &log(INFO, ' testing recovery type = ' . CFGOPTVAL_RESTORE_TYPE_XID);
@@ -872,8 +874,10 @@ sub run
strOptionalParam => '--tablespace-map-all=../../tablespace', bTablespace => false}); strOptionalParam => '--tablespace-map-all=../../tablespace', bTablespace => false});
# Save recovery file to test so we can use it in the next test # Save recovery file to test so we can use it in the next test
$strRecoveryFile = DB_FILE_RECOVERYCONF;
storageDb()->copy( storageDb()->copy(
$oHostDbMaster->dbBasePath() . qw{/} . DB_FILE_RECOVERYCONF, $self->testPath() . qw{/} . DB_FILE_RECOVERYCONF); $oHostDbMaster->dbBasePath() . qw{/} . $strRecoveryFile, $self->testPath() . qw{/} . $strRecoveryFile);
$oHostDbMaster->clusterStart(); $oHostDbMaster->clusterStart();
$oHostDbMaster->sqlSelectOneTest('select message from test', $strXidMessage); $oHostDbMaster->sqlSelectOneTest('select message from test', $strXidMessage);
@@ -894,7 +898,7 @@ sub run
executeTest('rm -rf ' . $oHostDbMaster->tablespacePath(1) . "/*"); executeTest('rm -rf ' . $oHostDbMaster->tablespacePath(1) . "/*");
# Restore recovery file that was saved in last test # Restore recovery file that was saved in last test
storageDb()->move($self->testPath . '/recovery.conf', $oHostDbMaster->dbBasePath() . '/recovery.conf'); storageDb()->move($self->testPath . "/${strRecoveryFile}", $oHostDbMaster->dbBasePath() . "/${strRecoveryFile}");
$oHostDbMaster->restore( $oHostDbMaster->restore(
undef, cfgDefOptionDefault(CFGCMD_RESTORE, CFGOPT_SET), {strType => CFGOPTVAL_RESTORE_TYPE_PRESERVE}); undef, cfgDefOptionDefault(CFGCMD_RESTORE, CFGOPT_SET), {strType => CFGOPTVAL_RESTORE_TYPE_PRESERVE});