Repository: mesos
Updated Branches:
  refs/heads/master ed3fcdfbc -> a96e0cb3f


Increased wait time for specific task updates.

If a test launches a task that requires internet access, for example,
to download docker images, an initial status update might take some
time to arrive. To avoid flaky tests, we compensate for this by
increasing the wait timeout via `AWAIT_READY_FOR`. However, with the
introduction of `TASK_STARTING`, the first received message is not
`TASK_RUNNING` any more, hence we should use `AWAIT_READY_FOR` for
`TASK_STARTING` updates as well. Since an image can be downloaded for
either executor, or task, or both, we keep extended timeouts for both
status updates.

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


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

Branch: refs/heads/master
Commit: a96e0cb3f159a03e0ebae571e7ee779ebe876e9d
Parents: ae8516c
Author: Alexander Rukletsov <al...@apache.org>
Authored: Fri Dec 8 17:37:44 2017 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Fri Dec 8 20:49:26 2017 +0100

----------------------------------------------------------------------
 .../containerizer/cgroups_isolator_tests.cpp    |  2 +-
 src/tests/containerizer/cni_isolator_tests.cpp  | 10 +++---
 .../docker_containerizer_tests.cpp              | 38 ++++++++++----------
 .../containerizer/memory_pressure_tests.cpp     |  2 +-
 .../nested_mesos_containerizer_tests.cpp        |  5 ++-
 .../containerizer/nvidia_gpu_isolator_tests.cpp |  2 +-
 .../containerizer/provisioner_appc_tests.cpp    |  2 +-
 .../containerizer/provisioner_docker_tests.cpp  |  4 +--
 .../containerizer/runtime_isolator_tests.cpp    |  4 +--
 src/tests/default_executor_tests.cpp            |  2 +-
 src/tests/health_check_tests.cpp                |  4 +--
 11 files changed, 37 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/cgroups_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp 
b/src/tests/containerizer/cgroups_isolator_tests.cpp
index 54404ee..adf72fd 100644
--- a/src/tests/containerizer/cgroups_isolator_tests.cpp
+++ b/src/tests/containerizer/cgroups_isolator_tests.cpp
@@ -188,7 +188,7 @@ TEST_F(CgroupsIsolatorTest, 
ROOT_CGROUPS_PERF_NET_CLS_UserCgroup)
 
   driver.launchTasks(offers.get()[0].id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
   AWAIT_READY_FOR(statusRunning, Seconds(60));

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/cni_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp 
b/src/tests/containerizer/cni_isolator_tests.cpp
index a6b660d..364e2e3 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -274,7 +274,7 @@ TEST_F(CniIsolatorTest, 
ROOT_INTERNET_CURL_LaunchCommandTask)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
@@ -761,7 +761,7 @@ TEST_F(CniIsolatorTest, 
ROOT_INTERNET_CURL_LaunchContainerInHostNetwork)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
@@ -902,7 +902,7 @@ TEST_F(CniIsolatorTest, ROOT_DynamicAddDelofCniConfig)
 
   driver.launchTasks(offer2.id(), {task}, filters);
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
@@ -1373,7 +1373,7 @@ TEST_F(CniIsolatorTest, 
ROOT_INTERNET_CURL_ReadOnlyBindMounts)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
@@ -1743,7 +1743,7 @@ TEST_F(CniIsolatorPortMapperTest, 
ROOT_INTERNET_CURL_PortMapper)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp 
b/src/tests/containerizer/docker_containerizer_tests.cpp
index 1f6ff52..629c7a8 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -517,7 +517,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -670,7 +670,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusRunning);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -802,7 +802,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_TaskKillingCapability)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -933,7 +933,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -1079,7 +1079,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
 
   AWAIT_READY(containerId);
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
   AWAIT_READY_FOR(statusRunning, Seconds(60));
@@ -2017,7 +2017,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(containerConfig);
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -2184,7 +2184,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(containerConfig);
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -2322,7 +2322,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(containerConfig);
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -2461,7 +2461,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_Default_CMD_Override)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(containerConfig);
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -2604,7 +2604,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_Default_CMD_Args)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(containerConfig);
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -3084,7 +3084,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_NC_PortMapping)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(containerConfig);
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -3222,7 +3222,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_LaunchSandboxWithColon)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -4104,7 +4104,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_NoTransitionFromKillingToRunning)
   driver.launchTasks(offers->front().id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -4237,7 +4237,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_NoTransitionFromKillingToFinished)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
   AWAIT_READY_FOR(statusRunning, Seconds(60));
@@ -4360,7 +4360,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -4503,7 +4503,7 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_Non_Root_Sandbox)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -4663,7 +4663,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DefaultDNS)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -4837,7 +4837,7 @@ TEST_F(DockerContainerizerIPv6Test, 
ROOT_DOCKER_LaunchIPv6HostNetwork)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
@@ -5035,7 +5035,7 @@ TEST_F(
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
   AWAIT_READY_FOR(statusRunning, Seconds(60));
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/memory_pressure_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/memory_pressure_tests.cpp 
b/src/tests/containerizer/memory_pressure_tests.cpp
index 9ada46d..0c3e738 100644
--- a/src/tests/containerizer/memory_pressure_tests.cpp
+++ b/src/tests/containerizer/memory_pressure_tests.cpp
@@ -270,7 +270,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
   EXPECT_EQ(task.task_id(), starting->task_id());
   EXPECT_EQ(TASK_STARTING, starting->state());
 
-  AWAIT_READY(startingAck);
+  AWAIT_READY_FOR(startingAck, Seconds(120));
 
   AWAIT_READY(running);
   EXPECT_EQ(task.task_id(), running->task_id());

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp 
b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
index 1829ba8..efc57ad 100644
--- a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
@@ -1041,11 +1041,10 @@ TEST_F(NestedMesosContainerizerTest,
 
   driver.launchTasks(offers->at(0).id(), {task});
 
-  AWAIT_READY(statusStarting);
+  // We wait wait up to 120 seconds to download the docker image.
+  AWAIT_READY_FOR(statusStarting, Seconds(120));
   ASSERT_EQ(TASK_STARTING, statusStarting->state());
 
-  // We wait wait up to 120 seconds
-  // to download the docker image.
   AWAIT_READY_FOR(statusRunning, Seconds(120));
   ASSERT_EQ(TASK_RUNNING, statusRunning->state());
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp 
b/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
index 8f6cd5e..9943178 100644
--- a/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
+++ b/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
@@ -293,7 +293,7 @@ TEST_F(NvidiaGpuTest, 
ROOT_INTERNET_CURL_CGROUPS_NVIDIA_GPU_NvidiaDockerImage)
 
   driver.launchTasks(offers2->at(0).id(), {task2});
 
-  AWAIT_READY(statusStarting2);
+  AWAIT_READY_FOR(statusStarting2, Seconds(120));
   ASSERT_EQ(TASK_STARTING, statusStarting2->state());
 
   AWAIT_READY_FOR(statusRunning2, Seconds(120));

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp 
b/src/tests/containerizer/provisioner_appc_tests.cpp
index fc1335c..ca9c61e 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -1031,7 +1031,7 @@ TEST_F(AppcProvisionerIntegrationTest, 
ROOT_SimpleLinuxImageTest)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(120));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp 
b/src/tests/containerizer/provisioner_docker_tests.cpp
index 2fe8950..9842743 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -442,7 +442,7 @@ TEST_F(ProvisionerDockerTest, ROOT_LocalPullerSimpleCommand)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
@@ -624,7 +624,7 @@ TEST_F(ProvisionerDockerTest, 
ROOT_INTERNET_CURL_ScratchImage)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/containerizer/runtime_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/runtime_isolator_tests.cpp 
b/src/tests/containerizer/runtime_isolator_tests.cpp
index 089605d..09ced98 100644
--- a/src/tests/containerizer/runtime_isolator_tests.cpp
+++ b/src/tests/containerizer/runtime_isolator_tests.cpp
@@ -158,7 +158,7 @@ TEST_F(DockerRuntimeIsolatorTest, 
ROOT_DockerDefaultCmdLocalPuller)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
@@ -330,7 +330,7 @@ TEST_F(DockerRuntimeIsolatorTest,
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(task.task_id(), statusStarting->task_id());
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/default_executor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/default_executor_tests.cpp 
b/src/tests/default_executor_tests.cpp
index d3e3ef7..f9f7a32 100644
--- a/src/tests/default_executor_tests.cpp
+++ b/src/tests/default_executor_tests.cpp
@@ -1624,7 +1624,7 @@ TEST_P(DefaultExecutorTest, 
ROOT_NoTransitionFromKillingToFinished)
           {v1::LAUNCH_GROUP(
               executorInfo, v1::createTaskGroupInfo({taskInfo}))}));
 
-  AWAIT_READY(startingUpdate);
+  AWAIT_READY_FOR(startingUpdate, Seconds(60));
   ASSERT_EQ(TASK_STARTING, startingUpdate->status().state());
 
   AWAIT_READY_FOR(runningUpdate, Seconds(60));

http://git-wip-us.apache.org/repos/asf/mesos/blob/a96e0cb3/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index c716ad9..bb909c5 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -1817,7 +1817,7 @@ TEST_F(HealthCheckTest,
 
   driver.launchTasks(offers.get()[0].id(), {task});
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
   // Increase time here to wait for pulling image finish.
@@ -2474,7 +2474,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
 
   AWAIT_READY(containerId);
 
-  AWAIT_READY(statusStarting);
+  AWAIT_READY_FOR(statusStarting, Seconds(60));
   EXPECT_EQ(TASK_STARTING, statusStarting->state());
 
   // Increase time here to wait for pulling image finish.

Reply via email to