db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00
Code Issues Releases Activity

Implemented issue #106: Roll pg_backup_remote into pg_backrest

Browse Source
This commit is contained in:
David Steele
2015-06-17 11:26:07 -04:00
parent 0ba4029253
commit 9511f9c35c
38 changed files with 3601 additions and 3336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/lib/BackRestTest/BackupTest.pm
View File

@@ -27,7 +27,7 @@ use BackRest::Exception;
use BackRest::File;
use BackRest::Ini;
use BackRest::Manifest;
use BackRest::Remote;
use BackRest::Protocol;
use BackRest::Utility;
use BackRestTest::CommonTest;
@@ -1511,7 +1511,7 @@ sub BackRestTestBackup_Test
#-------------------------------------------------------------------------------------------------------------------------------
# Create remotes
#-------------------------------------------------------------------------------------------------------------------------------
my $oRemote = BackRest::Remote->new
my $oRemote = BackRest::Protocol->new
(
$strHost, # Host
$strUserBackRest, # User
@@ -1523,7 +1523,7 @@ sub BackRestTestBackup_Test
OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK, # Compress network level
);
my $oLocal = new BackRest::Remote
my $oLocal = new BackRest::Protocol
(
undef, # Host
undef, # User

6
test/lib/BackRestTest/CommonTest.pm
View File

@@ -26,7 +26,7 @@ use BackRest::Db;
use BackRest::File;
use BackRest::Ini;
use BackRest::Manifest;
use BackRest::Remote;
use BackRest::Protocol;
use BackRest::Utility;
our @EXPORT = qw(BackRestTestCommon_Create BackRestTestCommon_Drop BackRestTestCommon_Setup BackRestTestCommon_ExecuteBegin
@@ -454,6 +454,8 @@ sub BackRestTestCommon_ExecuteRegAll
my $strTimestampRegExp = "[0-9]{4}-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]";
$strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'VERSION',
"version[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}" . version_get(), version_get() . '$');
$strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'TIMESTAMP',
"timestamp-[a-z-]+[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}[0-9]+", '[0-9]+$', false);
$strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'TIMESTAMP',
@@ -773,7 +775,7 @@ sub BackRestTestCommon_Setup
$strCommonDbTablespacePath = "${strCommonTestPath}/db/tablespace";
$strCommonCommandMain = "../bin/pg_backrest";
$strCommonCommandRemote = "${strCommonBasePath}/bin/pg_backrest_remote";
$strCommonCommandRemote = "${strCommonBasePath}/bin/pg_backrest";
$strCommonCommandPsql = "${strPgSqlBin}/psql -X %option% -h ${strCommonDbPath}";
$iCommonDbPort = 6543;

2
test/lib/BackRestTest/ConfigTest.pm
View File

@@ -547,7 +547,7 @@ sub BackRestTestConfig_Test
optionSetTest($oOption, OPTION_COMMAND_PSQL_OPTION, '--port 5432');
configLoadExpect($oOption, OP_BACKUP);
optionTestExpect(OPTION_COMMAND_REMOTE, dirname(abs_path($0)) . '/pg_backrest_remote');
optionTestExpect(OPTION_COMMAND_REMOTE, abs_path($0));
}
if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' missing option ' . OPTION_DB_PATH))

6
test/lib/BackRestTest/FileTest.pm
View File

@@ -23,7 +23,7 @@ use Time::HiRes qw(gettimeofday usleep);
use lib dirname($0) . '/../lib';
use BackRest::Config;
use BackRest::File;
use BackRest::Remote;
use BackRest::Protocol;
use BackRest::Utility;
use BackRestTest::CommonTest;
@@ -92,7 +92,7 @@ sub BackRestTestFile_Test
#-------------------------------------------------------------------------------------------------------------------------------
# Create remotes
#-------------------------------------------------------------------------------------------------------------------------------
my $oRemote = BackRest::Remote->new
my $oRemote = BackRest::Protocol->new
(
$strHost, # Host
$strUser, # User
@@ -104,7 +104,7 @@ sub BackRestTestFile_Test
OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK, # Compress network level
);
my $oLocal = new BackRest::Remote
my $oLocal = new BackRest::Protocol
(
undef, # Host
undef, # User

2
test/lib/BackRestTest/UtilityTest.pm
View File

@@ -42,7 +42,7 @@ sub BackRestTestUtility_Test
#-------------------------------------------------------------------------------------------------------------------------------
# Create remote
#-------------------------------------------------------------------------------------------------------------------------------
my $oLocal = new BackRest::Remote
my $oLocal = new BackRest::Protocol
(
undef, # Host
undef, # User