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/07/12 20:45:35 UTC
mesos git commit: Fixed ExecutorPIDTest.
Repository: mesos
Updated Branches:
refs/heads/master 386c7bdef -> 1af490242
Fixed ExecutorPIDTest.
Review: https://reviews.apache.org/r/49864/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1af49024
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1af49024
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1af49024
Branch: refs/heads/master
Commit: 1af49024202bcf1dfd9dbf4c73f6e5e4fce034f1
Parents: 386c7bd
Author: Haris Choudhary <ha...@gmail.com>
Authored: Tue Jul 12 13:44:45 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Jul 12 13:45:21 2016 -0700
----------------------------------------------------------------------
src/tests/containerizer/mesos_containerizer_tests.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1af49024/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 57588cc..e3c8daa 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -38,6 +38,7 @@
#include "slave/containerizer/mesos/containerizer.hpp"
#include "slave/containerizer/mesos/launcher.hpp"
+#include "slave/containerizer/mesos/constants.hpp"
#include "slave/containerizer/mesos/provisioner/provisioner.hpp"
@@ -56,6 +57,7 @@ using mesos::internal::slave::Fetcher;
using mesos::internal::slave::Launcher;
using mesos::internal::slave::MesosContainerizer;
using mesos::internal::slave::MesosContainerizerProcess;
+using mesos::internal::slave::MESOS_CONTAINERIZER;
using mesos::internal::slave::PosixLauncher;
using mesos::internal::slave::Provisioner;
using mesos::internal::slave::ProvisionInfo;
@@ -1291,7 +1293,7 @@ TEST_F(MesosLauncherStatusTest, ExecutorPIDTest)
Try<pid_t> forked = launcher.get()->fork(
containerId,
- flags.launcher_dir,
+ path::join(flags.launcher_dir, MESOS_CONTAINERIZER),
vector<string>(),
Subprocess::FD(STDIN_FILENO),
Subprocess::FD(STDOUT_FILENO),