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

Fixed #229: Check fails on target db host.

Browse Source 
Options that should not allow multiple values could be specified multiple times in pgbackrest.conf without an error being raised.
This commit is contained in:
David Steele
2016-08-15 20:15:17 -04:00
parent 88d9bd3d37
commit b25f10949a
4 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/lib/pgBackRestTest/Config/ConfigTest.pm
View File

@ -156,6 +156,10 @@ sub configLoadExpect
$strError = "'${strErrorParam1}' is not valid for '${strErrorParam2}' option" .
(defined($strErrorParam3) ? "\nHINT: ${strErrorParam3}." : '');
}
elsif ($iExpectedError == ERROR_OPTION_MULTIPLE_VALUE)
{
$strError = "option '${strErrorParam1}' cannot be specified multiple times";
}
elsif ($iExpectedError == ERROR_OPTION_INVALID_RANGE)
{
$strError = "'${strErrorParam1}' is not valid for '${strErrorParam2}' option";
@ -646,7 +650,6 @@ sub configTestRun
optionTestExpect(OPTION_THREAD_MAX, 3);
}
if (testRun(++$iRun, 'load from config global command section - option ' . OPTION_THREAD_MAX))
{
$oConfig = {};
@ -888,6 +891,19 @@ sub configTestRun
optionTestExpect(OPTION_REPO_PATH, '/repo');
}
if (testRun(++$iRun, CMD_BACKUP . ' option ' . OPTION_REPO_PATH . ' multiple times'))
{
$oConfig = {};
$$oConfig{&CONFIG_SECTION_GLOBAL}{&OPTION_REPO_PATH} = ['/repo', '/repo2'];
iniSave($strConfigFile, $oConfig, true);
optionSetTest($oOption, OPTION_STANZA, $strStanza);
optionSetTest($oOption, OPTION_DB_PATH, '/db');
optionSetTest($oOption, OPTION_CONFIG, $strConfigFile);
configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_MULTIPLE_VALUE, OPTION_REPO_PATH);
}
# Cleanup
testCleanup();
}