You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/06/07 00:47:31 UTC

git commit: Increased failover timeout for framework in AllocatorTest/SchedulerFailover test.

Repository: mesos
Updated Branches:
  refs/heads/master a121d81f8 -> 87ff24435


Increased failover timeout for framework in
AllocatorTest/SchedulerFailover test.

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


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

Branch: refs/heads/master
Commit: 87ff24435a5c622d51f9fe687f91c079a12a6134
Parents: a121d81
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Fri Jun 6 15:46:55 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Fri Jun 6 15:46:56 2014 -0700

----------------------------------------------------------------------
 src/tests/allocator_tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/87ff2443/src/tests/allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/allocator_tests.cpp b/src/tests/allocator_tests.cpp
index 79ea09c..430662b 100644
--- a/src/tests/allocator_tests.cpp
+++ b/src/tests/allocator_tests.cpp
@@ -975,7 +975,7 @@ TYPED_TEST(AllocatorTest, SchedulerFailover)
   FrameworkInfo frameworkInfo1;
   frameworkInfo1.set_name("framework1");
   frameworkInfo1.set_user("user1");
-  frameworkInfo1.set_failover_timeout(.1);
+  frameworkInfo1.set_failover_timeout(10);
 
   // Launch the first (i.e., failing) scheduler.
   MockScheduler sched1;
@@ -1046,7 +1046,7 @@ TYPED_TEST(AllocatorTest, SchedulerFailover)
 
   EXPECT_CALL(sched2, registered(_, frameworkId, _));
 
-  // Even though the scheduler failed over, the 1 cpu, 512 mem
+  // Even though the scheduler failed over, the 1 cpu, 256 mem
   // task that it launched earlier should still be running, so
   // only 2 cpus and 768 mem are available.
   Future<Nothing> resourceOffers;