mesos git commit: Fixed MesosContainerizerExecuteTest.IoRedirection test.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master fae5a6020 -> 4a1bbf7d3


Fixed MesosContainerizerExecuteTest.IoRedirection test.

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


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

Branch: refs/heads/master
Commit: 4a1bbf7d3b3ecbb65c4dfd7ee6994e94df844931
Parents: fae5a60
Author: Vinod Kone <vi...@gmail.com>
Authored: Fri Nov 7 17:39:28 2014 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Nov 7 21:52:45 2014 -0800

----------------------------------------------------------------------
 src/tests/containerizer_tests.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/4a1bbf7d/src/tests/containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer_tests.cpp b/src/tests/containerizer_tests.cpp
index abe8074..a63897b 100644
--- a/src/tests/containerizer_tests.cpp
+++ b/src/tests/containerizer_tests.cpp
@@ -25,6 +25,8 @@
 #include <process/future.hpp>
 #include <process/owned.hpp>
 
+#include <stout/strings.hpp>
+
 #include <mesos/mesos.hpp>
 
 #include "slave/flags.hpp"
@@ -279,7 +281,12 @@ TEST_F(MesosContainerizerExecuteTest, IoRedirection)
   EXPECT_EQ(0, wait.get().status());
 
   // Check that std{err, out} was redirected.
-  EXPECT_SOME_EQ(errMsg + "\n", os::read(path::join(directory, "stderr")));
+  // NOTE: Fetcher uses GLOG, which outputs extra information to
+  // stderr.
+  Try<string> stderr = os::read(path::join(directory, "stderr"));
+  ASSERT_SOME(stderr);
+  EXPECT_TRUE(strings::contains(stderr.get(), errMsg));
+
   EXPECT_SOME_EQ(outMsg + "\n", os::read(path::join(directory, "stdout")));
 
   delete containerizer.get();