svn commit: r1471689 - in /incubator/mesos/trunk/src/tests: isolator_tests.cpp zookeeper_tests.cpp

[be...@apache.org]

Author: benh
Date: Wed Apr 24 21:23:38 2013
New Revision: 1471689

URL: http://svn.apache.org/r1471689
Log:
Removed use of AWAIT_*_FOR since defaults have been increased.

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

Modified:
    incubator/mesos/trunk/src/tests/isolator_tests.cpp
    incubator/mesos/trunk/src/tests/zookeeper_tests.cpp

Modified: incubator/mesos/trunk/src/tests/isolator_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/isolator_tests.cpp?rev=1471689&r1=1471688&r2=1471689&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/isolator_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/isolator_tests.cpp Wed Apr 24 21:23:38 2013
@@ -192,7 +192,7 @@ TYPED_TEST(IsolatorTest, Usage)
 
   driver.killTask(task.task_id());
 
-  AWAIT_READY_FOR(status2, Seconds(5));
+  AWAIT_READY(status2);
 
   // TODO(bmahler): The command executor is buggy in that it does not
   // send TASK_KILLED for a non-zero exit code due to a kill.

Modified: incubator/mesos/trunk/src/tests/zookeeper_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/zookeeper_tests.cpp?rev=1471689&r1=1471688&r2=1471689&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/zookeeper_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/zookeeper_tests.cpp Wed Apr 24 21:23:38 2013
@@ -293,7 +293,7 @@ TEST_F(ZooKeeperTest, MasterDetectorShut
 
   server->startNetwork();
 
-  AWAIT_READY_FOR(newMasterDetected2, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_READY(newMasterDetected2);
 
   MasterDetector::destroy(detector.get());
 
@@ -362,7 +362,7 @@ TEST_F(ZooKeeperTest, MasterDetectorExpi
 
   // Wait for session expiration and ensure we receive a
   // NewMasterDetected message.
-  AWAIT_READY_FOR(newMasterDetected2, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_READY(newMasterDetected2);
 
   process::terminate(follower);
   process::wait(follower);
@@ -518,7 +518,7 @@ TEST_F(ZooKeeperTest, MasterDetectorExpi
 
   // Wait for session expiration and ensure we receive a
   // NewMasterDetected message.
-  AWAIT_READY_FOR(newMasterDetected4, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_READY(newMasterDetected4);
 
   process::terminate(slave);
   process::wait(slave);
@@ -682,7 +682,7 @@ TEST_F(ZooKeeperTest, GroupWatchWithSess
 
   server->expireSession(session.get().get());
 
-  AWAIT_READY_FOR(memberships, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_READY(memberships);
   EXPECT_EQ(0u, memberships.get().size());
 
   ASSERT_TRUE(membership.get().cancelled().isReady());
@@ -769,19 +769,19 @@ TEST_F(ZooKeeperTest, GroupPathWithRestr
   process::Future<zookeeper::Group::Membership> failedMembership1 =
     failedGroup1.join("fail");
 
-  AWAIT_FAILED_FOR(failedMembership1, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_FAILED(failedMembership1);
 
   zookeeper::Group failedGroup2(server->connectString(), NO_TIMEOUT,
                                 "/read-only/new", auth);
   process::Future<zookeeper::Group::Membership> failedMembership2 =
     failedGroup2.join("fail");
 
-  AWAIT_FAILED_FOR(failedMembership2, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_FAILED(failedMembership2);
 
   zookeeper::Group successGroup(server->connectString(), NO_TIMEOUT,
                                 "/read-only/writable/", auth);
   process::Future<zookeeper::Group::Membership> successMembership =
     successGroup.join("succeed");
 
-  AWAIT_READY_FOR(successMembership, Seconds(5)); // ZooKeeper needs time.
+  AWAIT_READY(successMembership);
 }