[6/6] mesos git commit: Windows: Disabled RestartSlaveRequireExecutorAuthentication test.

[jo...@apache.org]

Windows: Disabled RestartSlaveRequireExecutorAuthentication test.

This test became enabled when building with OpenSSL on Windows. The
first part of the test failed because of the use of the Linux command
`cat` to launch an indefinitely running task. This was fixed by using
`more` on Windows. However, the test subsequently fails when recoverying
to due "incompatible agent info", an existing bug: MESOS-7604.

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


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

Branch: refs/heads/master
Commit: 1a5b99f797854c1c107377d9fc40f99c0e864d94
Parents: 5212106
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Wed Oct 11 15:14:29 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Wed Oct 11 15:14:29 2017 -0700

----------------------------------------------------------------------
 src/tests/slave_tests.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1a5b99f7/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 2ff6dab..6d1e98d 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -6766,7 +6766,11 @@ TEST_F(SlaveTest, RunTaskGroupGenerateSecretAfterShutdown)
 // generation is enabled and HTTP executor authentication is not required will
 // be able to re-subscribe successfully when the agent is restarted with
 // required HTTP executor authentication.
-TEST_F(SlaveTest, RestartSlaveRequireExecutorAuthentication)
+//
+// TODO(andschwa): Enable this test after fixing MESOS-7604.
+TEST_F_TEMP_DISABLED_ON_WINDOWS(
+    SlaveTest,
+    RestartSlaveRequireExecutorAuthentication)
 {
   Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
@@ -6839,7 +6843,13 @@ TEST_F(SlaveTest, RestartSlaveRequireExecutorAuthentication)
     v1::Resources::parse("cpus:0.1;mem:32;disk:32").get();
 
   // Create a task which should run indefinitely.
-  v1::TaskInfo taskInfo = v1::createTask(agentId, resources, "cat");
+  const string command =
+#ifdef __WINDOWS__
+    "more";
+#else
+    "cat";
+#endif // __WINDOWS__
+  v1::TaskInfo taskInfo = v1::createTask(agentId, resources, command);
 
   v1::TaskGroupInfo taskGroup;
   taskGroup.add_tasks()->CopyFrom(taskInfo);