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/05 16:26:10 UTC
[2/5] mesos git commit: Reduced boilerplate in health check tests.
Reduced boilerplate in health check tests.
Review: https://reviews.apache.org/r/52431/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4c6ba2a6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4c6ba2a6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4c6ba2a6
Branch: refs/heads/master
Commit: 4c6ba2a6429b66d42129e7284528617c70f3e86b
Parents: 3eb8b20
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Oct 5 18:10:00 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 5 18:10:00 2016 +0200
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 109 +++-------------------------------
1 file changed, 7 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4c6ba2a6/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index d5656ee..2c7a585 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -235,21 +235,8 @@ TEST_F(HealthCheckTest, HealthyTask)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -388,7 +375,6 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
flags.docker_store_dir = path::join(os::getcwd(), "store");
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
ASSERT_SOME(slave);
@@ -522,7 +508,6 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
docker);
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> slave =
StartSlave(detector.get(), &containerizer, flags);
ASSERT_SOME(slave);
@@ -610,21 +595,8 @@ TEST_F(HealthCheckTest, HealthyTaskNonShell)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -679,21 +651,8 @@ TEST_F(HealthCheckTest, HealthStatusChange)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -915,7 +874,6 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
docker);
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> slave =
StartSlave(detector.get(), &containerizer, flags);
ASSERT_SOME(slave);
@@ -1034,21 +992,8 @@ TEST_F(HealthCheckTest, ConsecutiveFailures)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1124,21 +1069,8 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1191,21 +1123,8 @@ TEST_F(HealthCheckTest, DISABLED_GracePeriod)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1264,21 +1183,8 @@ TEST_F(HealthCheckTest, CheckCommandTimeout)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- slave::Flags flags = CreateSlaveFlags();
- flags.isolation = "posix/cpu,posix/mem";
-
- Fetcher fetcher;
-
- Try<MesosContainerizer*> _containerizer =
- MesosContainerizer::create(flags, false, &fetcher);
-
- CHECK_SOME(_containerizer);
- Owned<MesosContainerizer> containerizer(_containerizer.get());
-
Owned<MasterDetector> detector = master.get()->createDetector();
-
- Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), containerizer.get());
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
MockScheduler sched;
@@ -1348,7 +1254,6 @@ TEST_F(HealthCheckTest, DISABLED_HealthyTaskViaHTTPWithoutType)
flags.isolation = "posix/cpu,posix/mem";
Owned<MasterDetector> detector = master.get()->createDetector();
-
Try<Owned<cluster::Slave>> agent = StartSlave(detector.get());
ASSERT_SOME(agent);