Windows: Enabled tests that were blocked by MESOS-7604.

This commit enables tests that were previously disabled on Windows due
to MESOS-7604.

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


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

Branch: refs/heads/master
Commit: 5c8b1e7db88a098a9d3133012af461e5baba9b6b
Parents: b7cfcd7
Author: Andrew Schwartzmeyer <and...@schwartzmeyer.com>
Authored: Wed Jan 10 15:10:53 2018 -0800
Committer: Andrew Schwartzmeyer <and...@schwartzmeyer.com>
Committed: Fri Feb 9 12:06:52 2018 -0800

----------------------------------------------------------------------
 src/tests/api_tests.cpp    |  8 ++------
 src/tests/gc_tests.cpp     |  4 +---
 src/tests/master_tests.cpp |  4 +---
 src/tests/slave_tests.cpp  | 15 ++++++++-------
 4 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/5c8b1e7d/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 43517b5..b042201 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -3777,9 +3777,7 @@ TEST_P(MasterAPITest, Teardown)
 // This test verifies that a registered agent can be marked as gone and
 // shutdown by the master subsequently. Upon restarting the agent, it
 // should not be able to reregister with the master.
-//
-// TODO(andschwa): Enable this when MESOS-7604 is fixed.
-TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, MarkRegisteredAgentGone)
+TEST_P(MasterAPITest, MarkRegisteredAgentGone)
 {
   master::Flags masterFlags = CreateMasterFlags();
 
@@ -3900,9 +3898,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest,
 
 // This test verifies that the master correctly sends 'TASK_GONE_BY_OPERATOR'
 // status updates when an agent running the tasks is marked as gone.
-//
-// TODO(andschwa): Enable this when MESOS-7604 is fixed.
-TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, TaskUpdatesUponAgentGone)
+TEST_P(MasterAPITest, TaskUpdatesUponAgentGone)
 {
   master::Flags masterFlags = CreateMasterFlags();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/5c8b1e7d/src/tests/gc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp
index 0e34c01..947399e 100644
--- a/src/tests/gc_tests.cpp
+++ b/src/tests/gc_tests.cpp
@@ -285,9 +285,7 @@ class GarbageCollectorIntegrationTest : public MesosTest {};
 
 // This test ensures that garbage collection does not remove
 // the slave working directory after a slave restart.
-//
-// TODO(andschwa): Enable this when MESOS-7604 is fixed.
-TEST_F_TEMP_DISABLED_ON_WINDOWS(GarbageCollectorIntegrationTest, Restart)
+TEST_F(GarbageCollectorIntegrationTest, Restart)
 {
   Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);

http://git-wip-us.apache.org/repos/asf/mesos/blob/5c8b1e7d/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 7112bb4..76c86f8 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -8480,9 +8480,7 @@ TEST_F(MasterTest, IgnoreOldAgentReregistration)
 // This test checks that the master correctly garbage collects
 // information about gone agents from the registry using the
 // count-based GC criterion.
-//
-// TODO(andschwa): Enable this when MESOS-7604 is fixed.
-TEST_F_TEMP_DISABLED_ON_WINDOWS(MasterTest, RegistryGcByCount)
+TEST_F(MasterTest, RegistryGcByCount)
 {
   // Configure GC to only keep the most recent gone agent in the gone list.
   master::Flags masterFlags = CreateMasterFlags();

http://git-wip-us.apache.org/repos/asf/mesos/blob/5c8b1e7d/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index b54688a..628b0d0 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -1018,6 +1018,8 @@ TEST_F(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo)
 // This test runs a command without the command user field set. The
 // command will verify the assumption that the command is run as the
 // slave user (in this case, root).
+//
+// TODO(andschwa): Enable when user impersonation works on Windows.
 TEST_F_TEMP_DISABLED_ON_WINDOWS(
   SlaveTest, ROOT_RunTaskWithCommandInfoWithoutUser)
 {
@@ -5967,7 +5969,7 @@ TEST_F(SlaveTest, HTTPSchedulerLiveUpgrade)
 // Ensures that the slave can restart when there is an empty
 // framework pid. Executor messages should go through the
 // master (instead of directly to the scheduler!).
-TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart)
+TEST_F(SlaveTest, HTTPSchedulerSlaveRestart)
 {
   Try<Owned<cluster::Master>> master = this->StartMaster();
   ASSERT_SOME(master);
@@ -7269,10 +7271,7 @@ TEST_F(SlaveTest, 
RunTaskGroupGenerateSecretAfterShutdown)
 // be able to re-subscribe successfully when the agent is restarted with
 // required HTTP executor authentication.
 //
-// TODO(andschwa): Enable this test after fixing MESOS-7604.
-TEST_F_TEMP_DISABLED_ON_WINDOWS(
-    SlaveTest,
-    RestartSlaveRequireExecutorAuthentication)
+TEST_F(SlaveTest, RestartSlaveRequireExecutorAuthentication)
 {
   Try<Owned<cluster::Master>> master = StartMaster();
   ASSERT_SOME(master);
@@ -7655,6 +7654,8 @@ TEST_F(SlaveTest, KillTaskGroupBetweenRunTaskParts)
 
 // This test verifies that the agent correctly populates the
 // command info for default executor.
+//
+// TODO(andschwa): Enable when user impersonation works on Windows.
 TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, DefaultExecutorCommandInfo)
 {
   Try<Owned<cluster::Master>> master = StartMaster();
@@ -8622,7 +8623,7 @@ TEST_F(SlaveTest, DisconnectedExecutorDropsMessages)
 
 // This test verifies that the 'executor_reregistration_timeout' agent flag
 // successfully extends the timeout within which an executor can re-register.
-TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ExecutorReregistrationTimeoutFlag)
+TEST_F(SlaveTest, ExecutorReregistrationTimeoutFlag)
 {
   Clock::pause();
 
@@ -8673,7 +8674,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, 
ExecutorReregistrationTimeoutFlag)
   AWAIT_READY(offers);
   ASSERT_FALSE(offers->empty());
 
-  TaskInfo task = createTask(offers->front(), "sleep 1000");
+  TaskInfo task = createTask(offers->front(), SLEEP_COMMAND(1000));
 
   Future<TaskStatus> statusUpdate0;
   Future<TaskStatus> statusUpdate1;

Reply via email to