mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[148-lib-process-servers-without-arguments] trailing spaces

Browse Source
This commit is contained in:
Francis Dupont
2018-10-17 16:01:13 +02:00
parent dab02bea77
commit 005602d0a3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/process/tests/config_base_unittests.cc
View File

@@ -34,7 +34,7 @@ TEST(ConfigBase, configControlInfoTests) {
ctl_info1->addConfigDatabase("type=mysql host=example.com"); ctl_info1->addConfigDatabase("type=mysql host=example.com");
ctl_info1->addConfigDatabase("type=mysql host=example2.com"); ctl_info1->addConfigDatabase("type=mysql host=example2.com");
// Create a ConfigBase // Create a ConfigBase
ConfigBaseImpl base1; ConfigBaseImpl base1;
base1.setConfigControlInfo(ctl_info1); base1.setConfigControlInfo(ctl_info1);

12
src/lib/process/tests/config_ctl_parser_unittests.cc
View File

@@ -24,7 +24,7 @@ TEST(ConfigCtlInfoParser, validConfigs) {
std::string configs[] = { std::string configs[] = {
"{}", "{}",
"{ \"config-databases\": [] }", "{ \"config-databases\": [] }",
"{ \"config-databases\": [ \n" "{ \"config-databases\": [ \n"
" { \n" " { \n"
@@ -37,7 +37,7 @@ TEST(ConfigCtlInfoParser, validConfigs) {
" \"user\":\"bob\", \n" " \"user\":\"bob\", \n"
" \"password\":\"wonder\" \n" " \"password\":\"wonder\" \n"
" } \n" " } \n"
"] } \n" "] } \n"
}; };
for (auto config : configs) { for (auto config : configs) {
@@ -59,7 +59,7 @@ TEST(ConfigCtlInfoParser, validConfigs) {
// When the config is empty, ControlConfigInfo::toElement still // When the config is empty, ControlConfigInfo::toElement still
// generates a map with an empty db list. Replace source for // generates a map with an empty db list. Replace source for
// element comparison below. // element comparison below.
if (source_elem->size() == 0) { if (source_elem->size() == 0) {
ASSERT_NO_THROW (source_elem = Element::fromJSON( ASSERT_NO_THROW (source_elem = Element::fromJSON(
"{ \"config-databases\": [] }")); "{ \"config-databases\": [] }"));
@@ -74,12 +74,12 @@ TEST(ConfigCtlInfoParser, validConfigs) {
TEST(ConfigCtlInfoParser, invalidConfigs) { TEST(ConfigCtlInfoParser, invalidConfigs) {
// Note that configurations are must be valid JSON, but invalid logically. // Note that configurations are must be valid JSON, but invalid logically.
std::string configs[] = { std::string configs[] = {
"{ \"config-databases\": \"not_list\" }", "{ \"config-databases\": \"not_list\" }",
"{ \"config-databases\": [ \n" "{ \"config-databases\": [ \n"
" { \n" " { \n"
" \"bogus\": \"param\" \n" " \"bogus\": \"param\" \n"
" } \n" " } \n"
"] } \n" "] } \n"
}; };
for (auto config : configs) { for (auto config : configs) {
@@ -91,7 +91,7 @@ TEST(ConfigCtlInfoParser, invalidConfigs) {
" JSON error, test is broken: " << config; " JSON error, test is broken: " << config;
// Parse the Elements into a ConfigControlInfo. // Parse the Elements into a ConfigControlInfo.
ASSERT_THROW(parser.parse(source_elem), isc::ConfigError) ASSERT_THROW(parser.parse(source_elem), isc::ConfigError)
<< "config: " << config; << "config: " << config;
} }
} }

2
src/lib/process/tests/log_parser_unittests.cc
View File

@@ -73,7 +73,7 @@ class LoggingTest : public ::testing::Test {
}; };
const char* LoggingTest::TEST_LOG_NAME = "kea.test.log"; const char* LoggingTest::TEST_LOG_NAME = "kea.test.log";
const int LoggingTest::TEST_MAX_SIZE = 204800; // Smallest without disabling rotation const int LoggingTest::TEST_MAX_SIZE = 204800; // Smallest without disabling rotation
const int LoggingTest::TEST_MAX_VERS = 2; // More than the default of 1 const int LoggingTest::TEST_MAX_VERS = 2; // More than the default of 1
// Checks that the constructor is able to process specified storage properly. // Checks that the constructor is able to process specified storage properly.