Removed redundant 'Times(1)' from master validation tests. This patch removes calls to `.Times(1)` from `EXPECT_CALL` invocations in the master validation tests because it is redundant.
Review: https://reviews.apache.org/r/56139/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ab2ec81c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ab2ec81c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ab2ec81c Branch: refs/heads/master Commit: ab2ec81ce4b5af5ed3d5577e5c77eead1ce4ebef Parents: 7b32654 Author: Greg Mann <[email protected]> Authored: Fri Feb 17 11:47:46 2017 -0800 Committer: Vinod Kone <[email protected]> Committed: Fri Feb 17 11:47:46 2017 -0800 ---------------------------------------------------------------------- src/tests/master_validation_tests.cpp | 42 ++++++++++-------------------- 1 file changed, 14 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ab2ec81c/src/tests/master_validation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp index badf318..ea438ac 100644 --- a/src/tests/master_validation_tests.cpp +++ b/src/tests/master_validation_tests.cpp @@ -1107,8 +1107,7 @@ TEST_F(TaskValidationTest, ExecutorMissingFrameworkID) .WillOnce(LaunchTasks(executor, 1, 1, 16, "*")) .WillRepeatedly(Return()); // Ignore subsequent offers. - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -1275,8 +1274,7 @@ TEST_F(TaskValidationTest, TaskUsesNoResources) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -1325,8 +1323,7 @@ TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -1471,8 +1468,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -1510,8 +1506,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave) tasks.push_back(task1); tasks.push_back(task2); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); // Grab the "good" task but don't send a status update. Future<TaskInfo> task; @@ -1587,8 +1582,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves) TaskInfo task1 = createTask( offers1.get()[0], executor1.command().value(), executor1.executor_id()); - EXPECT_CALL(exec1, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec1, registered(_, _, _, _)); EXPECT_CALL(exec1, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -1627,8 +1621,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves) TaskInfo task2 = createTask( offers2.get()[0], executor2.command().value(), executor2.executor_id()); - EXPECT_CALL(exec2, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec2, registered(_, _, _, _)); EXPECT_CALL(exec2, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -1921,8 +1914,7 @@ TEST_F(TaskValidationTest, ExecutorShutdownGracePeriodIsNonNegative) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -1980,8 +1972,7 @@ TEST_F(TaskValidationTest, KillPolicyGracePeriodIsNonNegative) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -2396,8 +2387,7 @@ TEST_F(TaskGroupValidationTest, ExecutorUsesDockerContainerInfo) MesosSchedulerDriver driver( &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -2496,8 +2486,7 @@ TEST_F(TaskGroupValidationTest, ExecutorWithoutFrameworkId) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -2586,8 +2575,7 @@ TEST_F(TaskGroupValidationTest, TaskUsesDockerContainerInfo) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -2676,8 +2664,7 @@ TEST_F(TaskGroupValidationTest, TaskUsesNetworkInfo) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -2768,8 +2755,7 @@ TEST_F(TaskGroupValidationTest, TaskUsesDifferentExecutor) MesosSchedulerDriver driver( &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&driver, _))
