This is an automated email from the ASF dual-hosted git repository. chhsiao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 06aec4208a506bd14534876e36575bb84a1076ca Author: Chun-Hung Hsiao <[email protected]> AuthorDate: Wed May 15 14:19:08 2019 -0700 Changed the `*TaskIdEq` test matchers to take a `TaskID`. The `TaskStatusTaskIdEq` and `TaskStatusUpdateTaskIdEq` matchers previously take a `TaskInfo`, which is not very intuitive and inconsistent with other matchers such as `OptionTaskHasTaskID`. By making these matchers take a `TaskID` we also reduce coupling of this matcher and the structure of `TaskInfo`. Review: https://reviews.apache.org/r/70684 --- src/tests/api_tests.cpp | 8 +- .../containerizer/nvidia_gpu_isolator_tests.cpp | 4 +- src/tests/default_executor_tests.cpp | 96 +++++++++++----------- src/tests/gc_tests.cpp | 20 ++--- src/tests/master_tests.cpp | 18 ++-- src/tests/mesos.hpp | 8 +- src/tests/partition_tests.cpp | 6 +- src/tests/slave_tests.cpp | 33 +++++--- 8 files changed, 102 insertions(+), 91 deletions(-) diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp index bc19d7e..37d0cb1 100644 --- a/src/tests/api_tests.cpp +++ b/src/tests/api_tests.cpp @@ -5025,7 +5025,7 @@ TEST_P(MasterAPITest, UnreachableAgentMarkedGone) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo), + TaskStatusUpdateTaskIdEq(taskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(updateSequence) .WillOnce(DoAll( @@ -5035,7 +5035,7 @@ TEST_P(MasterAPITest, UnreachableAgentMarkedGone) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo), + TaskStatusUpdateTaskIdEq(taskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(updateSequence) .WillOnce(DoAll( @@ -5056,7 +5056,7 @@ TEST_P(MasterAPITest, UnreachableAgentMarkedGone) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo), + TaskStatusUpdateTaskIdEq(taskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_UNREACHABLE)))) .WillOnce(FutureArg<1>(&unreachableUpdate)); @@ -5092,7 +5092,7 @@ TEST_P(MasterAPITest, UnreachableAgentMarkedGone) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo), + TaskStatusUpdateTaskIdEq(taskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_GONE_BY_OPERATOR)))) .WillOnce(FutureArg<1>(&goneUpdate)); diff --git a/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp b/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp index 7f5bd8c..5e753e7 100644 --- a/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp +++ b/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp @@ -306,7 +306,7 @@ TEST_F(NvidiaGpuTest, ROOT_INTERNET_CURL_CGROUPS_NVIDIA_GPU_NvidiaDockerImage) Future<v1::scheduler::Event::Update> task1Finished; EXPECT_CALL(*scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task1), + TaskStatusUpdateTaskIdEq(task1.task_id()), TaskStatusUpdateIsTerminalState()))) .WillOnce(DoAll( FutureArg<1>(&task1Finished), @@ -314,7 +314,7 @@ TEST_F(NvidiaGpuTest, ROOT_INTERNET_CURL_CGROUPS_NVIDIA_GPU_NvidiaDockerImage) Future<v1::scheduler::Event::Update> task2Failed; EXPECT_CALL(*scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task2), + TaskStatusUpdateTaskIdEq(task2.task_id()), TaskStatusUpdateIsTerminalState()))) .WillOnce(DoAll( FutureArg<1>(&task2Failed), diff --git a/src/tests/default_executor_tests.cpp b/src/tests/default_executor_tests.cpp index 93d7a1c..1c3b488 100644 --- a/src/tests/default_executor_tests.cpp +++ b/src/tests/default_executor_tests.cpp @@ -413,7 +413,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task1) .WillOnce( @@ -424,7 +424,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task1) .WillOnce( @@ -435,7 +435,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task1) .WillOnce( @@ -451,7 +451,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task2) .WillOnce( @@ -462,7 +462,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task2) .WillOnce( @@ -473,7 +473,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task2) .WillOnce( @@ -520,7 +520,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo3), + TaskStatusUpdateTaskIdEq(taskInfo3.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task3) .WillOnce( @@ -531,7 +531,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo3), + TaskStatusUpdateTaskIdEq(taskInfo3.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task3) .WillOnce( @@ -542,7 +542,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo3), + TaskStatusUpdateTaskIdEq(taskInfo3.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task3) .WillOnce( @@ -667,7 +667,7 @@ TEST_P(DefaultExecutorTest, KillMultipleTasks) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task1) .WillOnce( @@ -678,7 +678,7 @@ TEST_P(DefaultExecutorTest, KillMultipleTasks) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task1) .WillOnce( @@ -689,7 +689,7 @@ TEST_P(DefaultExecutorTest, KillMultipleTasks) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task1) .WillOnce( @@ -705,7 +705,7 @@ TEST_P(DefaultExecutorTest, KillMultipleTasks) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task2) .WillOnce( @@ -716,7 +716,7 @@ TEST_P(DefaultExecutorTest, KillMultipleTasks) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task2) .WillOnce( @@ -727,7 +727,7 @@ TEST_P(DefaultExecutorTest, KillMultipleTasks) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task2) .WillOnce( @@ -827,7 +827,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task1) .WillOnce( @@ -838,7 +838,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task1) .WillOnce( @@ -849,7 +849,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_FAILED)))) .InSequence(task1) .WillOnce( @@ -865,7 +865,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task2) .WillOnce( @@ -876,7 +876,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task2) .WillOnce( @@ -887,7 +887,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task2) .WillOnce( @@ -1062,7 +1062,7 @@ TEST_P(DefaultExecutorTest, ROOT_ContainerStatusForTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task1) .WillOnce( @@ -1073,7 +1073,7 @@ TEST_P(DefaultExecutorTest, ROOT_ContainerStatusForTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task1) .WillOnce( @@ -1088,7 +1088,7 @@ TEST_P(DefaultExecutorTest, ROOT_ContainerStatusForTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task2) .WillOnce( @@ -1099,7 +1099,7 @@ TEST_P(DefaultExecutorTest, ROOT_ContainerStatusForTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task2) .WillOnce( @@ -1309,7 +1309,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task1) .WillOnce( @@ -1320,7 +1320,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task1) .WillOnce( @@ -1331,7 +1331,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_FINISHED)))) .InSequence(task1) .WillOnce( @@ -1347,7 +1347,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task2) .WillOnce( @@ -1358,7 +1358,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task2) .WillOnce( @@ -1369,7 +1369,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task2) .WillOnce( @@ -1907,7 +1907,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task1) .WillOnce( @@ -1918,7 +1918,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task1) .WillOnce( @@ -1929,7 +1929,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo1), + TaskStatusUpdateTaskIdEq(taskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_FINISHED)))) .InSequence(task1) .WillOnce( @@ -1945,7 +1945,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task2) .WillOnce( @@ -1956,7 +1956,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task2) .WillOnce( @@ -1967,7 +1967,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo2), + TaskStatusUpdateTaskIdEq(taskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_FAILED)))) .InSequence(task2) .WillOnce( @@ -1983,7 +1983,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo3), + TaskStatusUpdateTaskIdEq(taskInfo3.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(task3) .WillOnce( @@ -1994,7 +1994,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo3), + TaskStatusUpdateTaskIdEq(taskInfo3.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(task3) .WillOnce( @@ -2005,7 +2005,7 @@ TEST_P(DefaultExecutorTest, MaxCompletionTime) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo3), + TaskStatusUpdateTaskIdEq(taskInfo3.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(task3) .WillOnce( @@ -4160,7 +4160,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(sleepTaskInfo1), + TaskStatusUpdateTaskIdEq(sleepTaskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(sleepTask1) .WillOnce( @@ -4171,7 +4171,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(sleepTaskInfo1), + TaskStatusUpdateTaskIdEq(sleepTaskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(sleepTask1) .WillOnce( @@ -4182,7 +4182,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(sleepTaskInfo1), + TaskStatusUpdateTaskIdEq(sleepTaskInfo1.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(sleepTask1) .WillOnce( @@ -4198,7 +4198,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(sleepTaskInfo2), + TaskStatusUpdateTaskIdEq(sleepTaskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(sleepTask2) .WillOnce( @@ -4209,7 +4209,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(sleepTaskInfo2), + TaskStatusUpdateTaskIdEq(sleepTaskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(sleepTask2) .WillOnce( @@ -4220,7 +4220,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(sleepTaskInfo2), + TaskStatusUpdateTaskIdEq(sleepTaskInfo2.task_id()), TaskStatusUpdateStateEq(v1::TASK_KILLED)))) .InSequence(sleepTask2) .WillOnce( @@ -4235,7 +4235,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(failingTaskInfo), + TaskStatusUpdateTaskIdEq(failingTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(failingTask) .WillOnce( @@ -4246,7 +4246,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, ROOT_LaunchGroupFailure) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(failingTaskInfo), + TaskStatusUpdateTaskIdEq(failingTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_FAILED)))) .InSequence(failingTask) .WillOnce( diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp index a583f1d..2ea4bcb 100644 --- a/src/tests/gc_tests.cpp +++ b/src/tests/gc_tests.cpp @@ -734,7 +734,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutor) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(longLivedTaskInfo), + TaskStatusUpdateTaskIdEq(longLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(longTask) .WillOnce(DoAll( @@ -744,7 +744,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutor) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(longLivedTaskInfo), + TaskStatusUpdateTaskIdEq(longLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(longTask) .WillOnce(DoAll( @@ -759,7 +759,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutor) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(shortLivedTaskInfo), + TaskStatusUpdateTaskIdEq(shortLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(shortTask) .WillOnce(DoAll( @@ -769,7 +769,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutor) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(shortLivedTaskInfo), + TaskStatusUpdateTaskIdEq(shortLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(shortTask) .WillOnce(DoAll( @@ -779,7 +779,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutor) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(shortLivedTaskInfo), + TaskStatusUpdateTaskIdEq(shortLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_FINISHED)))) .InSequence(shortTask) .WillOnce(DoAll( @@ -988,7 +988,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutorRestart) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(longLivedTaskInfo), + TaskStatusUpdateTaskIdEq(longLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(longTask) .WillOnce(DoAll( @@ -998,7 +998,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutorRestart) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(longLivedTaskInfo), + TaskStatusUpdateTaskIdEq(longLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(longTask) .WillOnce(DoAll( @@ -1013,7 +1013,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutorRestart) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(shortLivedTaskInfo), + TaskStatusUpdateTaskIdEq(shortLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(shortTask) .WillOnce(DoAll( @@ -1023,7 +1023,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutorRestart) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(shortLivedTaskInfo), + TaskStatusUpdateTaskIdEq(shortLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(shortTask) .WillOnce(DoAll( @@ -1033,7 +1033,7 @@ TEST_F(GarbageCollectorIntegrationTest, LongLivedDefaultExecutorRestart) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(shortLivedTaskInfo), + TaskStatusUpdateTaskIdEq(shortLivedTaskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_FINISHED)))) .InSequence(shortTask) .WillOnce(DoAll( diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 964d935..097f1b7 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -6317,7 +6317,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); Future<TaskStatus> status1; - EXPECT_CALL(sched, statusUpdate(&driver, TaskStatusTaskIdEq(task1))) + EXPECT_CALL(sched, statusUpdate(&driver, TaskStatusTaskIdEq(task1.task_id()))) .WillOnce(FutureArg<1>(&status1)) .WillRepeatedly(Return()); @@ -6361,7 +6361,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor) task2.mutable_task_id()->set_value("2"); Future<TaskStatus> status2; - EXPECT_CALL(sched, statusUpdate(&driver, TaskStatusTaskIdEq(task2))) + EXPECT_CALL(sched, statusUpdate(&driver, TaskStatusTaskIdEq(task2.task_id()))) .WillOnce(FutureArg<1>(&status2)) .WillRepeatedly(Return()); @@ -9903,7 +9903,7 @@ TEST_F(MasterTest, TaskStateMetrics) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task1), + TaskStatusUpdateTaskIdEq(task1.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(taskSequence1) .WillOnce(v1::scheduler::SendAcknowledge(frameworkId, agentId)); @@ -9911,7 +9911,7 @@ TEST_F(MasterTest, TaskStateMetrics) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task1), + TaskStatusUpdateTaskIdEq(task1.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(taskSequence1) .WillOnce(DoAll( @@ -9954,7 +9954,7 @@ TEST_F(MasterTest, TaskStateMetrics) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task2), + TaskStatusUpdateTaskIdEq(task2.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(taskSequence2) .WillOnce(v1::scheduler::SendAcknowledge(frameworkId, agentId)); @@ -9962,7 +9962,7 @@ TEST_F(MasterTest, TaskStateMetrics) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task2), + TaskStatusUpdateTaskIdEq(task2.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(taskSequence2) .WillOnce(v1::scheduler::SendAcknowledge(frameworkId, agentId)); @@ -9970,7 +9970,7 @@ TEST_F(MasterTest, TaskStateMetrics) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(task2), + TaskStatusUpdateTaskIdEq(task2.task_id()), TaskStatusUpdateStateEq(v1::TASK_FINISHED)))) .InSequence(taskSequence2) .WillOnce(FutureArg<1>(&finishedUpdate)) @@ -10281,7 +10281,7 @@ TEST_P(MasterTestPrePostReservationRefinement, LaunchGroup) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo), + TaskStatusUpdateTaskIdEq(taskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_STARTING)))) .InSequence(updateSequence) .WillOnce(DoAll( @@ -10291,7 +10291,7 @@ TEST_P(MasterTestPrePostReservationRefinement, LaunchGroup) EXPECT_CALL( *scheduler, update(_, AllOf( - TaskStatusUpdateTaskIdEq(taskInfo), + TaskStatusUpdateTaskIdEq(taskInfo.task_id()), TaskStatusUpdateStateEq(v1::TASK_RUNNING)))) .InSequence(updateSequence) .WillOnce(FutureArg<1>(&runningUpdate)); diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp index e70e0e1..605a69f 100644 --- a/src/tests/mesos.hpp +++ b/src/tests/mesos.hpp @@ -3668,9 +3668,9 @@ MATCHER_P(OffersHaveResource, resource, "") // This matcher is used to match the task id of a `TaskStatus` message. -MATCHER_P(TaskStatusTaskIdEq, taskInfo, "") +MATCHER_P(TaskStatusTaskIdEq, taskId, "") { - return arg.task_id() == taskInfo.task_id(); + return arg.task_id() == taskId; } @@ -3683,9 +3683,9 @@ MATCHER_P(TaskStatusStateEq, taskState, "") // This matcher is used to match the task id of an `Event.update.status` // message. -MATCHER_P(TaskStatusUpdateTaskIdEq, taskInfo, "") +MATCHER_P(TaskStatusUpdateTaskIdEq, taskId, "") { - return arg.status().task_id() == taskInfo.task_id(); + return arg.status().task_id() == taskId; } diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp index 8148aff..ef8080a 100644 --- a/src/tests/partition_tests.cpp +++ b/src/tests/partition_tests.cpp @@ -2794,7 +2794,7 @@ TEST_F(PartitionTest, AgentWithTerminalTaskPartitioned) EXPECT_CALL( sched, statusUpdate(&driver, AllOf( - TaskStatusTaskIdEq(task), + TaskStatusTaskIdEq(task.task_id()), TaskStatusStateEq(TASK_STARTING)))) .InSequence(taskSequence) .WillOnce(FutureArg<1>(&starting)); @@ -2802,7 +2802,7 @@ TEST_F(PartitionTest, AgentWithTerminalTaskPartitioned) EXPECT_CALL( sched, statusUpdate(&driver, AllOf( - TaskStatusTaskIdEq(task), + TaskStatusTaskIdEq(task.task_id()), TaskStatusStateEq(TASK_RUNNING)))) .InSequence(taskSequence) .WillOnce(FutureArg<1>(&running)); @@ -2810,7 +2810,7 @@ TEST_F(PartitionTest, AgentWithTerminalTaskPartitioned) EXPECT_CALL( sched, statusUpdate(&driver, AllOf( - TaskStatusTaskIdEq(task), + TaskStatusTaskIdEq(task.task_id()), TaskStatusStateEq(TASK_FINISHED)))) .InSequence(taskSequence) .WillOnce(FutureArg<1>(&finished)) diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 50882a5..c203597 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -4956,14 +4956,16 @@ TEST_F(SlaveTest, LaunchTasksReorderUnscheduleGC) Future<v1::scheduler::Event::Update> taskStarting1, taskStarting2; Future<v1::scheduler::Event::Update> taskRunning1, taskRunning2; - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1.task_id()))) .WillOnce(DoAll( FutureArg<1>(&taskStarting1), v1::scheduler::SendAcknowledge(frameworkId, agentId))) .WillOnce(DoAll( FutureArg<1>(&taskRunning1), v1::scheduler::SendAcknowledge(frameworkId, agentId))); - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2.task_id()))) .WillOnce(DoAll( FutureArg<1>(&taskStarting2), v1::scheduler::SendAcknowledge(frameworkId, agentId))) @@ -5092,14 +5094,16 @@ TEST_F(SlaveTest, LaunchTasksReorderTaskAuthorization) Future<v1::scheduler::Event::Update> taskStarting1, taskStarting2; Future<v1::scheduler::Event::Update> taskRunning1, taskRunning2; - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1.task_id()))) .WillOnce(DoAll( FutureArg<1>(&taskStarting1), v1::scheduler::SendAcknowledge(frameworkId, agentId))) .WillOnce(DoAll( FutureArg<1>(&taskRunning1), v1::scheduler::SendAcknowledge(frameworkId, agentId))); - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2.task_id()))) .WillOnce(DoAll( FutureArg<1>(&taskStarting2), v1::scheduler::SendAcknowledge(frameworkId, agentId))) @@ -5229,15 +5233,18 @@ TEST_F(SlaveTest, LaunchTaskGroupsUsingSameExecutorKillFirstTaskGroup) Future<v1::scheduler::Event::Update> task1Killed; Future<v1::scheduler::Event::Update> task2Lost; Future<v1::scheduler::Event::Update> task3Lost; - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task1Killed), v1::scheduler::SendAcknowledge(frameworkId, agentId))); - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task2Lost), v1::scheduler::SendAcknowledge(frameworkId, agentId))); - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo3))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo3.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task3Lost), v1::scheduler::SendAcknowledge(frameworkId, agentId))); @@ -5455,14 +5462,16 @@ TEST_F(SlaveTest, LaunchTaskGroupsUsingSameExecutorKillLaterTaskGroup) Future<v1::scheduler::Event::Update> task1Starting, task1Running; Future<v1::scheduler::Event::Update> task2Killed; - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task1Starting), v1::scheduler::SendAcknowledge(frameworkId, agentId))) .WillOnce(DoAll( FutureArg<1>(&task1Running), v1::scheduler::SendAcknowledge(frameworkId, agentId))); - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task2Killed), v1::scheduler::SendAcknowledge(frameworkId, agentId))); @@ -5645,14 +5654,16 @@ TEST_F(SlaveTest, ShutdownExecutorWhileTaskLaunching) Future<v1::scheduler::Event::Update> task1Starting, task1Running; Future<v1::scheduler::Event::Update> task2Lost; - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo1.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task1Starting), v1::scheduler::SendAcknowledge(frameworkId, agentId))) .WillOnce(DoAll( FutureArg<1>(&task1Running), v1::scheduler::SendAcknowledge(frameworkId, agentId))); - EXPECT_CALL(*scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2))) + EXPECT_CALL( + *scheduler, update(_, TaskStatusUpdateTaskIdEq(taskInfo2.task_id()))) .WillOnce(DoAll( FutureArg<1>(&task2Lost), v1::scheduler::SendAcknowledge(frameworkId, agentId)));
