You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/10/27 13:49:39 UTC
[4/6] mesos git commit: Avoided temporary `MockDocker` pointers in
health check tests.
Avoided temporary `MockDocker` pointers in health check tests.
Review: https://reviews.apache.org/r/52560/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/189550fc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/189550fc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/189550fc
Branch: refs/heads/master
Commit: 189550fca3806ca4e768f7f83c298270b783f52a
Parents: 2fa0c4a
Author: haosdent huang <ha...@gmail.com>
Authored: Thu Oct 27 14:26:42 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Oct 27 15:18:00 2016 +0200
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/189550fc/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 1bd9650..790943c 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -474,10 +474,8 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
// docker executor.
TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
{
- MockDocker* mockDocker =
- new MockDocker(tests::flags.docker, tests::flags.docker_socket);
-
- Shared<Docker> docker(mockDocker);
+ Shared<Docker> docker(new MockDocker(
+ tests::flags.docker, tests::flags.docker_socket));
Try<Nothing> validateResult = docker->validateVersion(Version(1, 3, 0));
ASSERT_SOME(validateResult)
@@ -840,10 +838,8 @@ TEST_F(HealthCheckTest, HealthStatusChange)
// Testing health status change reporting to scheduler for docker executor.
TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
{
- MockDocker* mockDocker =
- new MockDocker(tests::flags.docker, tests::flags.docker_socket);
-
- Shared<Docker> docker(mockDocker);
+ Shared<Docker> docker(new MockDocker(
+ tests::flags.docker, tests::flags.docker_socket));
Try<Nothing> validateResult = docker->validateVersion(Version(1, 3, 0));
ASSERT_SOME(validateResult)