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 2016/10/19 23:33:53 UTC
[03/10] mesos git commit: Cleaned up a test case.
Cleaned up a test case.
Review: https://reviews.apache.org/r/52656/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0bef37ab
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0bef37ab
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0bef37ab
Branch: refs/heads/master
Commit: 0bef37ab88415bc876ba9511528af88265fd0be5
Parents: e510813
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Oct 19 16:31:45 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Oct 19 16:31:45 2016 -0700
----------------------------------------------------------------------
src/tests/fault_tolerance_tests.cpp | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0bef37ab/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 5a9944c..e15bf8d 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -855,7 +855,10 @@ TEST_F(FaultToleranceTest, FrameworkReregister)
}
-TEST_F(FaultToleranceTest, TaskLost)
+// This test checks that if a non-partition-aware scheduler that is
+// disconnected from the master attempts to launch a task, it receives
+// a TASK_LOST status update.
+TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchLost)
{
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
@@ -874,8 +877,8 @@ TEST_F(FaultToleranceTest, TaskLost)
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
- Future<process::Message> message =
- FUTURE_MESSAGE(Eq(FrameworkRegisteredMessage().GetTypeName()), _, _);
+ Future<FrameworkRegisteredMessage> message =
+ FUTURE_PROTOBUF(FrameworkRegisteredMessage(), _, _);
driver.start();
@@ -893,12 +896,7 @@ TEST_F(FaultToleranceTest, TaskLost)
AWAIT_READY(disconnected);
- TaskInfo task;
- task.set_name("test task");
- task.mutable_task_id()->set_value("1");
- task.mutable_slave_id()->MergeFrom(offers.get()[0].slave_id());
- task.mutable_resources()->MergeFrom(offers.get()[0].resources());
- task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO);
+ TaskInfo task = createTask(offers.get()[0], "sleep 60");
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -909,6 +907,7 @@ TEST_F(FaultToleranceTest, TaskLost)
AWAIT_READY(status);
EXPECT_EQ(TASK_LOST, status.get().state());
EXPECT_EQ(TaskStatus::REASON_MASTER_DISCONNECTED, status.get().reason());
+ EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
driver.stop();
driver.join();