Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
8717ef28
Commit
8717ef28
authored
Apr 11, 2018
by
Francis Dupont
Browse files
[master] Final changes from 5374 merge
parent
ab60973a
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/tests/get_config_unittest.cc
View file @
8717ef28
// Copyright (C)
2017-
2018 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
...
...
@@ -6331,7 +6331,7 @@ const char* UNPARSED_CONFIGS[] = {
" },
\n
"
" {
\n
"
"
\"
boot-file-name
\"
:
\"\"
,
\n
"
"
\"
name
\"
:
\"
t
hree
\"
,
\n
"
"
\"
name
\"
:
\"
t
wo
\"
,
\n
"
"
\"
next-server
\"
:
\"
0.0.0.0
\"
,
\n
"
"
\"
option-data
\"
: [ ],
\n
"
"
\"
option-def
\"
: [ ],
\n
"
...
...
@@ -6339,7 +6339,7 @@ const char* UNPARSED_CONFIGS[] = {
" },
\n
"
" {
\n
"
"
\"
boot-file-name
\"
:
\"\"
,
\n
"
"
\"
name
\"
:
\"
t
wo
\"
,
\n
"
"
\"
name
\"
:
\"
t
hree
\"
,
\n
"
"
\"
next-server
\"
:
\"
0.0.0.0
\"
,
\n
"
"
\"
option-data
\"
: [ ],
\n
"
"
\"
option-def
\"
: [ ],
\n
"
...
...
@@ -6777,24 +6777,24 @@ const char* UNPARSED_CONFIGS[] = {
"
\"
test
\"
:
\"
'' == ''
\"\n
"
" },
\n
"
" {
\n
"
"
\"
comment
\"
:
\"
a comment
\"
,
\n
"
"
\"
boot-file-name
\"
:
\"\"
,
\n
"
"
\"
name
\"
:
\"
both
\"
,
\n
"
"
\"
name
\"
:
\"
none
\"
,
\n
"
"
\"
next-server
\"
:
\"
0.0.0.0
\"
,
\n
"
"
\"
option-data
\"
: [ ],
\n
"
"
\"
option-def
\"
: [ ],
\n
"
"
\"
server-hostname
\"
:
\"\"
,
\n
"
"
\"
user-context
\"
: {
\n
"
"
\"
version
\"
: 1
\n
"
" }
\n
"
"
\"
server-hostname
\"
:
\"\"\n
"
" },
\n
"
" {
\n
"
"
\"
comment
\"
:
\"
a comment
\"
,
\n
"
"
\"
boot-file-name
\"
:
\"\"
,
\n
"
"
\"
name
\"
:
\"
none
\"
,
\n
"
"
\"
name
\"
:
\"
both
\"
,
\n
"
"
\"
next-server
\"
:
\"
0.0.0.0
\"
,
\n
"
"
\"
option-data
\"
: [ ],
\n
"
"
\"
option-def
\"
: [ ],
\n
"
"
\"
server-hostname
\"
:
\"\"\n
"
"
\"
server-hostname
\"
:
\"\"
,
\n
"
"
\"
user-context
\"
: {
\n
"
"
\"
version
\"
: 1
\n
"
" }
\n
"
" }
\n
"
" ],
\n
"
"
\"
control-socket
\"
: {
\n
"
...
...
src/bin/dhcp4/tests/get_config_unittest.cc.skel
View file @
8717ef28
...
...
@@ -347,7 +347,9 @@ TEST_P(Dhcp4GetConfigTest, run) {
class IntToString {
public:
std::string operator()(const testing::TestParamInfo<size_t>& n) {
return to_string(n.param);
std::ostringstream ss;
ss << static_cast<size_t>(n.param);
return (ss.str());
}
};
...
...
src/bin/dhcp6/tests/get_config_unittest.cc
View file @
8717ef28
...
...
@@ -6340,16 +6340,16 @@ const char* UNPARSED_CONFIGS[] = {
"
\"
test
\"
:
\"
'' == ''
\"\n
"
" },
\n
"
" {
\n
"
"
\"
name
\"
:
\"
none
\"
,
\n
"
"
\"
option-data
\"
: [ ]
\n
"
" },
\n
"
" {
\n
"
"
\"
comment
\"
:
\"
a comment
\"
,
\n
"
"
\"
name
\"
:
\"
both
\"
,
\n
"
"
\"
option-data
\"
: [ ],
\n
"
"
\"
user-context
\"
: {
\n
"
"
\"
version
\"
: 1
\n
"
" }
\n
"
" },
\n
"
" {
\n
"
"
\"
name
\"
:
\"
none
\"
,
\n
"
"
\"
option-data
\"
: [ ]
\n
"
" }
\n
"
" ],
\n
"
"
\"
control-socket
\"
: {
\n
"
...
...
src/bin/dhcp6/tests/get_config_unittest.cc.skel
View file @
8717ef28
// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2017
-2018
Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
...
...
@@ -351,7 +351,9 @@ TEST_P(Dhcp6GetConfigTest, run) {
class IntToString {
public:
std::string operator()(const testing::TestParamInfo<size_t>& n) {
return to_string(n.param);
std::ostringstream ss;
ss << static_cast<size_t>(n.param);
return (ss.str());
}
};
...
...
src/lib/dhcpsrv/tests/host_unittest.cc
View file @
8717ef28
...
...
@@ -1169,6 +1169,7 @@ TEST_F(HostTest, unparse) {
"}"
,
host
->
toElement6
()
->
str
());
// Now the classes are in defined order (vs. alphabetical order).
host
->
addClientClass6
(
"hub"
);
host
->
addClientClass6
(
"device"
);
...
...
@@ -1184,7 +1185,7 @@ TEST_F(HostTest, unparse) {
host
->
toElement4
()
->
str
());
EXPECT_EQ
(
"{ "
"
\"
client-classes
\"
: [
\"
device
\"
,
\"
hub
\"
], "
"
\"
client-classes
\"
: [
\"
hub
\"
,
\"
device
\"
], "
"
\"
duid
\"
:
\"
11:12:13:14:15
\"
, "
"
\"
hostname
\"
:
\"
myhost
\"
, "
"
\"
ip-addresses
\"
: [ ], "
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment