You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/09/24 18:08:32 UTC

[2/5] mesos git commit: Updated tests to properly set 'flags.launcher' with correct value.

Updated tests to properly set 'flags.launcher' with correct value.

In some of our tests we manually create a 'PosixLauncher' rather than
relying on the value of 'flags.launcher' to decide which type of
launcher to create. Since calls to 'CreateSlaveFlags()' set
'flags.launcher' to 'linux' by default, there was a discrepency in
what the flags said, and what actual launcher type we were creating.

This commit fixes this to explicitly set 'flags.launcher' to the
appropriate type.

Review: https://reviews.apache.org/r/51720/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a5ff5feb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a5ff5feb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a5ff5feb

Branch: refs/heads/master
Commit: a5ff5feb766e65844ead9a66ccf47f78cbe72df5
Parents: c847855
Author: Kevin Klues <kl...@gmail.com>
Authored: Sat Sep 24 10:58:24 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Sat Sep 24 10:58:24 2016 -0700

----------------------------------------------------------------------
 src/tests/container_logger_tests.cpp                  | 1 +
 src/tests/containerizer/mesos_containerizer_tests.cpp | 8 ++++++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a5ff5feb/src/tests/container_logger_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp
index 1b121a2..f761172 100644
--- a/src/tests/container_logger_tests.cpp
+++ b/src/tests/container_logger_tests.cpp
@@ -140,6 +140,7 @@ TEST_F(ContainerLoggerTest, MesosContainerizerRecover)
 {
   // Prepare a MesosContainerizer with a mocked container logger.
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher = PosixLauncher::create(flags);
   ASSERT_SOME(launcher);

http://git-wip-us.apache.org/repos/asf/mesos/blob/a5ff5feb/src/tests/containerizer/mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp
index e67274c..8b5a19e 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -140,6 +140,7 @@ public:
     }
 
     slave::Flags flags = CreateSlaveFlags();
+    flags.launcher = "posix";
 
     Try<Launcher*> launcher = PosixLauncher::create(flags);
     if (launcher.isError()) {
@@ -614,6 +615,7 @@ public:
 TEST_F(MesosContainerizerDestroyTest, DestroyWhileFetching)
 {
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher = PosixLauncher::create(flags);
   ASSERT_SOME(launcher);
@@ -682,6 +684,7 @@ TEST_F(MesosContainerizerDestroyTest, DestroyWhileFetching)
 TEST_F(MesosContainerizerDestroyTest, DestroyWhilePreparing)
 {
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher = PosixLauncher::create(flags);
   ASSERT_SOME(launcher);
@@ -805,6 +808,7 @@ public:
 TEST_F(MesosContainerizerProvisionerTest, ProvisionFailed)
 {
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher_ = PosixLauncher::create(flags);
   ASSERT_SOME(launcher_);
@@ -899,6 +903,7 @@ TEST_F(MesosContainerizerProvisionerTest, ProvisionFailed)
 TEST_F(MesosContainerizerProvisionerTest, DestroyWhileProvisioning)
 {
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher_ = PosixLauncher::create(flags);
   ASSERT_SOME(launcher_);
@@ -995,6 +1000,7 @@ TEST_F(MesosContainerizerProvisionerTest, DestroyWhileProvisioning)
 TEST_F(MesosContainerizerProvisionerTest, IsolatorCleanupBeforePrepare)
 {
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher_ = PosixLauncher::create(flags);
   ASSERT_SOME(launcher_);
@@ -1105,6 +1111,7 @@ TEST_F(MesosContainerizerDestroyTest, LauncherDestroyFailure)
 {
   // Create a TestLauncher backed by PosixLauncher.
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher_ = PosixLauncher::create(flags);
   ASSERT_SOME(launcher_);
@@ -1241,6 +1248,7 @@ class MesosLauncherStatusTest : public MesosTest {};
 TEST_F(MesosLauncherStatusTest, ExecutorPIDTest)
 {
   slave::Flags flags = CreateSlaveFlags();
+  flags.launcher = "posix";
 
   Try<Launcher*> launcher = PosixLauncher::create(flags);
   ASSERT_SOME(launcher);