Fixed invocations of 'executorEnvironment' in the tests. This patch updates invocations of `executorEnvironment` in the tests to use the function's new signature, which accepts an authentication token.
Review: https://reviews.apache.org/r/57747/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/873497f2 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/873497f2 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/873497f2 Branch: refs/heads/master Commit: 873497f2718f91d86746ce2266376c7f442c8c5f Parents: 8b6ddb5 Author: Greg Mann <[email protected]> Authored: Sat Mar 25 12:05:09 2017 -0700 Committer: Anand Mazumdar <[email protected]> Committed: Sat Mar 25 12:05:09 2017 -0700 ---------------------------------------------------------------------- src/tests/containerizer/mesos_containerizer_tests.cpp | 3 +++ src/tests/hook_tests.cpp | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/873497f2/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 ec9f354..9a5cfe4 100644 --- a/src/tests/containerizer/mesos_containerizer_tests.cpp +++ b/src/tests/containerizer/mesos_containerizer_tests.cpp @@ -35,6 +35,7 @@ #include <stout/uuid.hpp> #include "slave/flags.hpp" +#include "slave/slave.hpp" #include "slave/containerizer/fetcher.hpp" @@ -56,6 +57,7 @@ using namespace process; using mesos::internal::master::Master; +using mesos::internal::slave::executorEnvironment; using mesos::internal::slave::Fetcher; using mesos::internal::slave::FetcherProcess; using mesos::internal::slave::Launcher; @@ -535,6 +537,7 @@ TEST_F(MesosContainerizerIsolatorPreparationTest, ExecutorEnvironmentVariable) directory, slaveId, PID<Slave>(), + None(), false); Future<bool> launch = containerizer->launch( http://git-wip-us.apache.org/repos/asf/mesos/blob/873497f2/src/tests/hook_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp index 71e619c..02d8f80 100644 --- a/src/tests/hook_tests.cpp +++ b/src/tests/hook_tests.cpp @@ -60,6 +60,7 @@ using mesos::internal::master::Master; using mesos::internal::protobuf::createLabel; using mesos::internal::slave::DockerContainerizer; +using mesos::internal::slave::executorEnvironment; using mesos::internal::slave::Fetcher; using mesos::internal::slave::MesosContainerizer; using mesos::internal::slave::Slave; @@ -309,6 +310,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( directory, slaveId, PID<Slave>(), + None(), false); // Test hook adds a new environment variable "FOO" to the executor
