mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject mesos git commit: Fixed a few style issues in slave tests.
Date Fri, 06 Nov 2015 23:50:07 GMT
Repository: mesos
Updated Branches:
  refs/heads/master d3a2bdc96 -> 202dacdd8


Fixed a few style issues in slave tests.


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

Branch: refs/heads/master
Commit: 202dacdd8c3d74e3b9b6d7f396fb395f64921a58
Parents: d3a2bdc
Author: Jie Yu <yujie.jay@gmail.com>
Authored: Fri Nov 6 15:49:46 2015 -0800
Committer: Jie Yu <yujie.jay@gmail.com>
Committed: Fri Nov 6 15:50:00 2015 -0800

----------------------------------------------------------------------
 src/tests/slave_tests.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/202dacdd/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index ac102f1..a526ddf 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -573,9 +573,10 @@ TEST_F(SlaveTest, GetExecutorInfo)
   EXPECT_NE(string::npos, executor.command().value().find("mesos-executor"));
 }
 
-// Ensure getExecutorInfo for mesos-executor gets the ContainerInfo, if
-// present.  This ensures the MesosContainerizer can get the NetworkInfo even
-// when using the command executor.
+
+// Ensure getExecutorInfo for mesos-executor gets the ContainerInfo,
+// if present. This ensures the MesosContainerizer can get the
+// NetworkInfo even when using the command executor.
 TEST_F(SlaveTest, GetExecutorInfoForTaskWithContainer)
 {
   TestContainerizer containerizer;
@@ -615,7 +616,7 @@ TEST_F(SlaveTest, GetExecutorInfoForTaskWithContainer)
 
   // Now assert that the executor has both the command and ContainerInfo
   EXPECT_TRUE(executor.command().shell());
-  // CommandInfo.container is not included.  In this test the ContainerInfo
+  // CommandInfo.container is not included. In this test the ContainerInfo
   // must be included in Executor.container (copied from TaskInfo.container).
   EXPECT_FALSE(executor.command().has_container());
   EXPECT_TRUE(executor.has_container());
@@ -625,10 +626,11 @@ TEST_F(SlaveTest, GetExecutorInfoForTaskWithContainer)
   EXPECT_EQ("public", executor.container().network_infos(0).groups(0));
 }
 
-// This tests ensures that MesosContainerizer will launch a command executor
-// even if it contains a ContainerInfo in the TaskInfo.  Prior to 0.26.0, this
-// was only used to launch Docker containers, so MesosContainerizer would fail
-// the launch.
+
+// This tests ensures that MesosContainerizer will launch a command
+// executor even if it contains a ContainerInfo in the TaskInfo.
+// Prior to 0.26.0, this was only used to launch Docker containers, so
+// MesosContainerizer would fail the launch.
 TEST_F(SlaveTest, LaunchTaskInfoWithContainerInfo)
 {
   Try<PID<Master>> master = StartMaster();


Mime
View raw message