Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Adam Osuchowski
Kea
Commits
8107a491
Commit
8107a491
authored
Dec 01, 2016
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[5074] A couple of trivial fixes in the comments.
parent
71d45704
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
14 deletions
+18
-14
src/lib/process/tests/d_controller_unittests.cc
src/lib/process/tests/d_controller_unittests.cc
+18
-14
No files found.
src/lib/process/tests/d_controller_unittests.cc
View file @
8107a491
...
...
@@ -284,14 +284,17 @@ TEST_F(DStubControllerTest, configUpdateTests) {
/// chain of methods and to handle error conditions.
/// This test verifies that:
/// 1. That an unrecognized command is detected and returns a status of
/// d2::COMMAND_INVALID.
/// 2. Shutdown command is recognized and returns a d2::COMMAND_SUCCESS status.
/// 3. A valid, custom controller command is recognized a d2::COMMAND_SUCCESS
/// process::COMMAND_INVALID.
/// 2. Shutdown command is recognized and returns a process::COMMAND_SUCCESS
/// status.
/// 4. A valid, custom process command is recognized a d2::COMMAND_SUCCESS
/// 3. A valid, custom controller command is recognized a
/// process::COMMAND_SUCCESS
/// status.
/// 5. That a valid controller command that fails returns a d2::COMMAND_ERROR.
/// 6. That a valid process command that fails returns a d2::COMMAND_ERROR.
/// 4. A valid, custom process command is recognized a
/// process::COMMAND_SUCCESS status.
/// 5. That a valid controller command that fails returns a
/// process::COMMAND_ERROR.
/// 6. That a valid process command that fails returns a process::COMMAND_ERROR.
TEST_F
(
DStubControllerTest
,
executeCommandTests
)
{
int
rcode
=
-
1
;
isc
::
data
::
ConstElementPtr
answer
;
...
...
@@ -301,38 +304,39 @@ TEST_F(DStubControllerTest, executeCommandTests) {
ASSERT_NO_THROW
(
initProcess
());
EXPECT_TRUE
(
checkProcess
());
// Verify that an unknown command returns an d2::COMMAND_INVALID response.
// Verify that an unknown command returns an process::COMMAND_INVALID
// response.
std
::
string
bogus_command
(
"bogus"
);
answer
=
executeCommand
(
bogus_command
,
arg_set
);
isc
::
config
::
parseAnswer
(
rcode
,
answer
);
EXPECT_EQ
(
COMMAND_INVALID
,
rcode
);
// Verify that shutdown command returns
d2
::COMMAND_SUCCESS response.
// Verify that shutdown command returns
process
::COMMAND_SUCCESS response.
answer
=
executeCommand
(
SHUT_DOWN_COMMAND
,
arg_set
);
isc
::
config
::
parseAnswer
(
rcode
,
answer
);
EXPECT_EQ
(
COMMAND_SUCCESS
,
rcode
);
// Verify that a valid custom controller command returns
//
d2
::COMMAND_SUCCESS response.
//
process
::COMMAND_SUCCESS response.
answer
=
executeCommand
(
DStubController
::
stub_ctl_command_
,
arg_set
);
isc
::
config
::
parseAnswer
(
rcode
,
answer
);
EXPECT_EQ
(
COMMAND_SUCCESS
,
rcode
);
// Verify that a valid custom process command returns
d2::COMMAND_SUCCESS
// response.
// Verify that a valid custom process command returns
//
process::COMMAND_SUCCESS
response.
answer
=
executeCommand
(
DStubProcess
::
stub_proc_command_
,
arg_set
);
isc
::
config
::
parseAnswer
(
rcode
,
answer
);
EXPECT_EQ
(
COMMAND_SUCCESS
,
rcode
);
// Verify that a valid custom controller command that fails returns
// a
d2
::COMMAND_ERROR.
// a
process
::COMMAND_ERROR.
SimFailure
::
set
(
SimFailure
::
ftControllerCommand
);
answer
=
executeCommand
(
DStubController
::
stub_ctl_command_
,
arg_set
);
isc
::
config
::
parseAnswer
(
rcode
,
answer
);
EXPECT_EQ
(
COMMAND_ERROR
,
rcode
);
// Verify that a valid custom process command that fails returns
// a
d2
::COMMAND_ERROR.
// a
process
::COMMAND_ERROR.
SimFailure
::
set
(
SimFailure
::
ftProcessCommand
);
answer
=
executeCommand
(
DStubProcess
::
stub_proc_command_
,
arg_set
);
isc
::
config
::
parseAnswer
(
rcode
,
answer
);
...
...
@@ -456,5 +460,5 @@ TEST_F(DStubControllerTest, sigtermShutdown) {
EXPECT_TRUE
(
elapsed_time
.
total_milliseconds
()
<
300
);
}
};
// end of isc::
d2
namespace
};
// end of isc::
process
namespace
};
// end of isc namespace
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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