Removed all instances of '.Times(1)' from Mesos tests. Using `.Times(1)` with `EXPECT_CALL` is redundant, as this is implied by default. This patch removes all such remaining occurrences from the Mesos tests.
Review: https://reviews.apache.org/r/56187/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ad72a33b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ad72a33b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ad72a33b Branch: refs/heads/master Commit: ad72a33b0f3030dc4a8a09f3b4233519dc2eff41 Parents: ab2ec81 Author: Greg Mann <[email protected]> Authored: Fri Feb 17 11:47:52 2017 -0800 Committer: Vinod Kone <[email protected]> Committed: Fri Feb 17 11:47:52 2017 -0800 ---------------------------------------------------------------------- src/tests/api_tests.cpp | 6 +- .../containerizer/cgroups_isolator_tests.cpp | 15 +-- src/tests/containerizer/cpu_isolator_tests.cpp | 6 +- .../linux_capabilities_isolator_tests.cpp | 3 +- .../linux_filesystem_isolator_tests.cpp | 18 ++-- .../containerizer/memory_isolator_tests.cpp | 3 +- .../posix_rlimits_isolator_tests.cpp | 12 +-- src/tests/exception_tests.cpp | 3 +- src/tests/fetcher_cache_tests.cpp | 3 +- src/tests/gc_tests.cpp | 12 +-- src/tests/master_authorization_tests.cpp | 27 ++--- src/tests/master_contender_detector_tests.cpp | 3 +- src/tests/master_maintenance_tests.cpp | 18 ++-- src/tests/master_tests.cpp | 102 +++++++------------ src/tests/rate_limiting_tests.cpp | 24 ++--- src/tests/reconciliation_tests.cpp | 3 +- src/tests/registrar_zookeeper_tests.cpp | 6 +- src/tests/resource_offers_tests.cpp | 27 ++--- src/tests/slave_recovery_tests.cpp | 6 +- src/tests/slave_tests.cpp | 4 +- src/tests/status_update_manager_tests.cpp | 9 +- 21 files changed, 104 insertions(+), 206 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp index aa7d89a..7715da9 100644 --- a/src/tests/api_tests.cpp +++ b/src/tests/api_tests.cpp @@ -3642,8 +3642,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunch) 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, _)) @@ -3654,8 +3653,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunch) EXPECT_CALL(exec, registered(_, _, _, _)) .WillOnce(FutureSatisfy(&executorRegistered)); - EXPECT_CALL(exec, launchTask(_, _)) - .Times(1); + EXPECT_CALL(exec, launchTask(_, _)); driver.start(); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/containerizer/cgroups_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp index b86716d..971ea47 100644 --- a/src/tests/containerizer/cgroups_isolator_tests.cpp +++ b/src/tests/containerizer/cgroups_isolator_tests.cpp @@ -137,8 +137,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup) 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, _)) @@ -277,8 +276,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu) master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<vector<Offer>> offers1; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -379,8 +377,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CFS_EnableCfs) 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, _)) @@ -480,8 +477,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PidsAndTids) 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, _)) @@ -889,8 +885,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample) 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/containerizer/cpu_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cpu_isolator_tests.cpp b/src/tests/containerizer/cpu_isolator_tests.cpp index d61a8dc..f117826 100644 --- a/src/tests/containerizer/cpu_isolator_tests.cpp +++ b/src/tests/containerizer/cpu_isolator_tests.cpp @@ -96,8 +96,7 @@ TEST_P(CpuIsolatorTest, ROOT_UserCpuUsage) 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, _)) @@ -188,8 +187,7 @@ TEST_P(CpuIsolatorTest, ROOT_SystemCpuUsage) 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/containerizer/linux_capabilities_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/linux_capabilities_isolator_tests.cpp b/src/tests/containerizer/linux_capabilities_isolator_tests.cpp index d5332ab..f9d2a53 100644 --- a/src/tests/containerizer/linux_capabilities_isolator_tests.cpp +++ b/src/tests/containerizer/linux_capabilities_isolator_tests.cpp @@ -207,8 +207,7 @@ TEST_P(LinuxCapabilitiesIsolatorTest, ROOT_Ping) master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(_, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp index c273357..51017a3 100644 --- a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp +++ b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp @@ -845,8 +845,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, 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, _)) @@ -917,8 +916,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, 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, _)) @@ -1145,8 +1143,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, 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, _)) @@ -1281,8 +1278,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, ROOT_SandboxEnvironmentVariable) 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, _)) @@ -1366,8 +1362,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, 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, _)) @@ -1461,8 +1456,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/containerizer/memory_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/memory_isolator_tests.cpp b/src/tests/containerizer/memory_isolator_tests.cpp index bcf8e89..388e62a 100644 --- a/src/tests/containerizer/memory_isolator_tests.cpp +++ b/src/tests/containerizer/memory_isolator_tests.cpp @@ -96,8 +96,7 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage) 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/posix_rlimits_isolator_tests.cpp b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp index fc57e23..b7ccc7e 100644 --- a/src/tests/containerizer/posix_rlimits_isolator_tests.cpp +++ b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp @@ -72,8 +72,7 @@ TEST_F(PosixRLimitsIsolatorTest, InvalidLimits) DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Future<vector<Offer>> offers; @@ -141,8 +140,7 @@ TEST_F(PosixRLimitsIsolatorTest, UnsetLimits) { master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Future<vector<Offer>> offers; @@ -222,8 +220,7 @@ TEST_F(PosixRLimitsIsolatorTest, BothSoftAndHardLimitSet) master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Future<vector<Offer>> offers; @@ -290,8 +287,7 @@ TEST_F(PosixRLimitsIsolatorTest, TaskExceedingLimit) master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Future<vector<Offer>> offers; http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/exception_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/exception_tests.cpp b/src/tests/exception_tests.cpp index 7b66bd1..316c329 100644 --- a/src/tests/exception_tests.cpp +++ b/src/tests/exception_tests.cpp @@ -148,8 +148,7 @@ TEST_F(ExceptionTest, DisallowSchedulerCallbacksOnAbort) 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/fetcher_cache_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fetcher_cache_tests.cpp b/src/tests/fetcher_cache_tests.cpp index 7dfc822..e5eee9b 100644 --- a/src/tests/fetcher_cache_tests.cpp +++ b/src/tests/fetcher_cache_tests.cpp @@ -209,8 +209,7 @@ void FetcherCacheTest::SetUp() driver.reset(new MesosSchedulerDriver( &scheduler, frameworkInfo, master->pid, DEFAULT_CREDENTIAL)); - EXPECT_CALL(scheduler, registered(driver.get(), _, _)) - .Times(1); + EXPECT_CALL(scheduler, registered(driver.get(), _, _)); // This installs a temporary reaction to resourceOffers calls, which // must be in place BEFORE starting the scheduler driver. This http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/gc_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp index d9776b6..293c146 100644 --- a/src/tests/gc_tests.cpp +++ b/src/tests/gc_tests.cpp @@ -290,8 +290,7 @@ TEST_F(GarbageCollectorIntegrationTest, Restart) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Resources resources = Resources::parse(flags.resources.get()).get(); double cpus = resources.get<Value::Scalar>("cpus").get().value(); @@ -306,8 +305,7 @@ TEST_F(GarbageCollectorIntegrationTest, Restart) EXPECT_CALL(sched, offerRescinded(_, _)) .WillRepeatedly(Return()); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -536,8 +534,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedExecutor) EXPECT_CALL(sched, offerRescinded(_, _)) .WillRepeatedly(Return()); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -641,8 +638,7 @@ TEST_F(GarbageCollectorIntegrationTest, DiskUsage) .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*")) .WillRepeatedly(Return()); // Ignore subsequent offers. - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/master_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp index f973cf4..94107d0 100644 --- a/src/tests/master_authorization_tests.cpp +++ b/src/tests/master_authorization_tests.cpp @@ -122,8 +122,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask) 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, _)) @@ -143,8 +142,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(executor); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -196,8 +194,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask) 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, _)) @@ -372,8 +369,7 @@ TEST_F(MasterAuthorizationTest, KillTask) 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, _)) @@ -586,8 +582,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedLost) 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, _)) @@ -692,8 +687,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedDropped) 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, _)) @@ -794,8 +788,7 @@ TEST_F(MasterAuthorizationTest, FrameworkRemoved) 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, _)) @@ -924,8 +917,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves) 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)); @@ -942,8 +934,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves) AWAIT_READY(status2); ASSERT_EQ(TASK_RUNNING, status2.get().state()); - EXPECT_CALL(exec1, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec1, registered(_, _, _, _)); EXPECT_CALL(exec1, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/master_contender_detector_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp index d41caea..2849471 100644 --- a/src/tests/master_contender_detector_tests.cpp +++ b/src/tests/master_contender_detector_tests.cpp @@ -123,8 +123,7 @@ TEST_F(MasterContenderDetectorTest, File) 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/master_maintenance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_maintenance_tests.cpp b/src/tests/master_maintenance_tests.cpp index 49f715a..237dc03 100644 --- a/src/tests/master_maintenance_tests.cpp +++ b/src/tests/master_maintenance_tests.cpp @@ -495,8 +495,7 @@ TEST_F(MasterMaintenanceTest, PreV1SchedulerSupport) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); // Intercept offers sent to the scheduler. Future<vector<Offer>> normalOffers; @@ -587,16 +586,14 @@ TEST_F(MasterMaintenanceTest, EnterMaintenanceMode) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); // Launch a task. EXPECT_CALL(sched, resourceOffers(&driver, _)) .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, 1, 64, "*")) .WillRepeatedly(Return()); // Ignore subsequent offers. - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -1161,8 +1158,7 @@ TEST_F(MasterMaintenanceTest, InverseOffers) // Just work with a single offer to simplify the rest of the test. v1::Offer offer = offers->offers(0); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -1374,14 +1370,12 @@ TEST_F(MasterMaintenanceTest, InverseOffersFilters) TestContainerizer containerizer(execs); - EXPECT_CALL(exec1, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec1, registered(_, _, _, _)); EXPECT_CALL(exec1, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); - EXPECT_CALL(exec2, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec2, registered(_, _, _, _)); EXPECT_CALL(exec2, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index c8ef9d6..64443dc 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -143,8 +143,7 @@ TEST_F(MasterTest, TaskRunning) 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, _)) @@ -179,8 +178,7 @@ TEST_F(MasterTest, TaskRunning) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -235,8 +233,7 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning) 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, _)) @@ -256,8 +253,7 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning) task.mutable_resources()->MergeFrom(offer.resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -344,8 +340,7 @@ TEST_F(MasterTest, KillTask) 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, _)) @@ -367,8 +362,7 @@ TEST_F(MasterTest, KillTask) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -419,8 +413,7 @@ TEST_F(MasterTest, KillUnknownTask) 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, _)) @@ -442,8 +435,7 @@ TEST_F(MasterTest, KillUnknownTask) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -524,8 +516,7 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition) // Start a task. TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -753,8 +744,7 @@ TEST_F(MasterTest, StatusUpdateAck) 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, _)) @@ -773,8 +763,7 @@ TEST_F(MasterTest, StatusUpdateAck) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -828,8 +817,7 @@ TEST_F(MasterTest, RecoverResources) 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, _)) @@ -860,8 +848,7 @@ TEST_F(MasterTest, RecoverResources) task.mutable_resources()->MergeFrom(taskResources); task.mutable_executor()->MergeFrom(executorInfo); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -952,8 +939,7 @@ TEST_F(MasterTest, FrameworkMessage) MesosSchedulerDriver schedDriver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&schedDriver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&schedDriver, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(&schedDriver, _)) @@ -1040,8 +1026,7 @@ TEST_F(MasterTest, MultipleExecutors) 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, _)) @@ -1073,16 +1058,14 @@ TEST_F(MasterTest, MultipleExecutors) tasks.push_back(task1); tasks.push_back(task2); - EXPECT_CALL(exec1, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec1, registered(_, _, _, _)); Future<TaskInfo> exec1Task; EXPECT_CALL(exec1, launchTask(_, _)) .WillOnce(DoAll(SendStatusUpdateFromTask(TASK_RUNNING), FutureArg<1>(&exec1Task))); - EXPECT_CALL(exec2, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec2, registered(_, _, _, _)); Future<TaskInfo> exec2Task; EXPECT_CALL(exec2, launchTask(_, _)) @@ -1166,8 +1149,7 @@ TEST_F(MasterTest, MasterInfoOnReElection) MockScheduler sched; TestingMesosSchedulerDriver driver(&sched, &detector); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); Future<Nothing> resourceOffers; EXPECT_CALL(sched, resourceOffers(&driver, _)) @@ -1262,8 +1244,7 @@ TEST_F(WhitelistTest, WhitelistSlave) 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 +1306,7 @@ TEST_F(MasterTest, MasterLost) MockScheduler sched; TestingMesosSchedulerDriver driver(&sched, &detector); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); EXPECT_CALL(sched, resourceOffers(&driver, _)) .WillRepeatedly(Return()); // Ignore offers. @@ -2683,8 +2663,7 @@ TEST_F(MasterZooKeeperTest, LostZooKeeperCluster) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, stringify(url.get()), DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); EXPECT_CALL(sched, resourceOffers(&driver, _)) .WillRepeatedly(Return()); // Ignore offers. @@ -2817,8 +2796,7 @@ TEST_F(MasterTest, RecoveredFramework) .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, 1, 64, "*")) .WillRepeatedly(Return()); // Ignore subsequent offers. - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -2868,8 +2846,7 @@ TEST_F(MasterTest, RecoveredFramework) EXPECT_TRUE(parse1->values["orphan_tasks"].as<JSON::Array>().values.empty()); - EXPECT_CALL(sched, disconnected(&driver)) - .Times(1); + EXPECT_CALL(sched, disconnected(&driver)); // Stop the master. PID<Master> originalPid = master.get()->pid; @@ -3266,8 +3243,7 @@ TEST_F(MasterTest, TasksEndpoint) 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, _)) @@ -3286,8 +3262,7 @@ TEST_F(MasterTest, TasksEndpoint) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -3970,8 +3945,7 @@ TEST_F(MasterTest, StateSummaryEndpoint) 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, _)) @@ -3993,8 +3967,7 @@ TEST_F(MasterTest, StateSummaryEndpoint) task.mutable_resources()->MergeFrom(offers.get()[0].resources()); task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -4261,8 +4234,7 @@ TEST_F(MasterTest, ExecutorLabels) 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, _)) @@ -4288,8 +4260,7 @@ TEST_F(MasterTest, ExecutorLabels) labels->add_labels()->CopyFrom(createLabel("key2", "value2")); labels->add_labels()->CopyFrom(createLabel("key1", "value3")); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -4355,8 +4326,7 @@ TEST_F(MasterTest, TaskLabels) 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, _)) @@ -4382,8 +4352,7 @@ TEST_F(MasterTest, TaskLabels) labels->add_labels()->CopyFrom(createLabel("bar", "baz")); labels->add_labels()->CopyFrom(createLabel("bar", "qux")); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -4461,8 +4430,7 @@ TEST_F(MasterTest, TaskStatusLabels) 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, _)) @@ -4564,8 +4532,7 @@ TEST_F(MasterTest, TaskStatusContainerStatus) 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, _)) @@ -5904,8 +5871,7 @@ TEST_F(MasterTest, FailoverAgentReregisterFirst) // Simulate master failover. We leave the scheduler without a master // so it does not attempt to re-register yet. - EXPECT_CALL(sched, disconnected(&driver)) - .Times(1); + EXPECT_CALL(sched, disconnected(&driver)); schedDetector.appoint(None()); slaveDetector.appoint(None()); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/rate_limiting_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/rate_limiting_tests.cpp b/src/tests/rate_limiting_tests.cpp index f105b67..646848e 100644 --- a/src/tests/rate_limiting_tests.cpp +++ b/src/tests/rate_limiting_tests.cpp @@ -124,8 +124,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, NoRateLimiting) MesosSchedulerDriver* driver = new MesosSchedulerDriver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(driver, _, _)); // Grab the stuff we need to replay the subscribe call. Future<mesos::scheduler::Call> subscribeCall = FUTURE_CALL( @@ -218,8 +217,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, RateLimitingEnabled) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(&driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(&driver, _, _)); // Grab the stuff we need to replay the subscribe call. Future<mesos::scheduler::Call> subscribeCall = FUTURE_CALL( @@ -364,8 +362,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, DifferentPrincipalFrameworks) MesosSchedulerDriver* driver1 = new MesosSchedulerDriver(&sched1, frameworkInfo1, master.get()->pid); - EXPECT_CALL(sched1, registered(driver1, _, _)) - .Times(1); + EXPECT_CALL(sched1, registered(driver1, _, _)); // Grab the stuff we need to replay the subscribe call for sched1. Future<mesos::scheduler::Call> subscribeCall1 = FUTURE_CALL( @@ -388,8 +385,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, DifferentPrincipalFrameworks) MockScheduler sched2; MesosSchedulerDriver driver2(&sched2, frameworkInfo2, master.get()->pid); - EXPECT_CALL(sched2, registered(&driver2, _, _)) - .Times(1); + EXPECT_CALL(sched2, registered(&driver2, _, _)); // Grab the stuff we need to replay the subscribe call for sched2. Future<mesos::scheduler::Call> subscribeCall2 = FUTURE_CALL( @@ -591,8 +587,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SamePrincipalFrameworks) MesosSchedulerDriver* driver1 = new MesosSchedulerDriver( &sched1, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched1, registered(driver1, _, _)) - .Times(1); + EXPECT_CALL(sched1, registered(driver1, _, _)); // Grab the stuff we need to replay the subscribe call for sched1. Future<mesos::scheduler::Call> subscribeCall1 = FUTURE_CALL( @@ -615,8 +610,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SamePrincipalFrameworks) MesosSchedulerDriver driver2( &sched2, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched2, registered(&driver2, _, _)) - .Times(1); + EXPECT_CALL(sched2, registered(&driver2, _, _)); // Grab the stuff we need to replay the subscribe call for sched2. Future<mesos::scheduler::Call> subscribeCall2 = FUTURE_CALL( @@ -815,8 +809,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SchedulerFailover) &sched2, framework2, master.get()->pid, DEFAULT_CREDENTIAL); // Scheduler driver ignores duplicate FrameworkRegisteredMessages. - EXPECT_CALL(sched2, registered(&driver2, frameworkId.get(), _)) - .Times(1); + EXPECT_CALL(sched2, registered(&driver2, frameworkId.get(), _)); Future<Nothing> sched1Error; EXPECT_CALL(sched1, error(&driver1, "Framework failed over")) @@ -934,8 +927,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, CapacityReached) MesosSchedulerDriver* driver = new MesosSchedulerDriver( &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(driver, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(driver, _, _)); // Grab the stuff we need to replay the subscribe call. Future<mesos::scheduler::Call> subscribeCall = FUTURE_CALL( http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/reconciliation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp index fc0ff91..3573d55 100644 --- a/src/tests/reconciliation_tests.cpp +++ b/src/tests/reconciliation_tests.cpp @@ -878,8 +878,7 @@ TEST_F(ReconciliationTest, PendingTask) 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, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/registrar_zookeeper_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/registrar_zookeeper_tests.cpp b/src/tests/registrar_zookeeper_tests.cpp index 598a930..a31942d 100644 --- a/src/tests/registrar_zookeeper_tests.cpp +++ b/src/tests/registrar_zookeeper_tests.cpp @@ -75,8 +75,7 @@ TEST_F(RegistrarZooKeeperTest, TaskRunning) 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, _)) @@ -90,8 +89,7 @@ TEST_F(RegistrarZooKeeperTest, TaskRunning) TaskInfo task = createTask(offers.get()[0], "dummy", DEFAULT_EXECUTOR_ID); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/resource_offers_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/resource_offers_tests.cpp b/src/tests/resource_offers_tests.cpp index 9d6fa92..74dacf1 100644 --- a/src/tests/resource_offers_tests.cpp +++ b/src/tests/resource_offers_tests.cpp @@ -84,8 +84,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( 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, _)) @@ -120,8 +119,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterFrameworkStops) MesosSchedulerDriver driver1( &sched1, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched1, registered(&driver1, _, _)) - .Times(1); + EXPECT_CALL(sched1, registered(&driver1, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched1, resourceOffers(&driver1, _)) @@ -139,8 +137,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterFrameworkStops) MesosSchedulerDriver driver2( &sched2, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched2, registered(&driver2, _, _)) - .Times(1); + EXPECT_CALL(sched2, registered(&driver2, _, _)); EXPECT_CALL(sched2, resourceOffers(&driver2, _)) .WillOnce(FutureArg<1>(&offers)); @@ -167,8 +164,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedWhenUnused) MesosSchedulerDriver driver1( &sched1, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched1, registered(&driver1, _, _)) - .Times(1); + EXPECT_CALL(sched1, registered(&driver1, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched1, resourceOffers(&driver1, _)) @@ -186,8 +182,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedWhenUnused) MesosSchedulerDriver driver2( &sched2, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched2, registered(&driver2, _, _)) - .Times(1); + EXPECT_CALL(sched2, registered(&driver2, _, _)); EXPECT_CALL(sched2, resourceOffers(&driver2, _)) .WillOnce(FutureArg<1>(&offers)); @@ -218,8 +213,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterTaskInfoError) MesosSchedulerDriver driver1( &sched1, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched1, registered(&driver1, _, _)) - .Times(1); + EXPECT_CALL(sched1, registered(&driver1, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched1, resourceOffers(&driver1, _)) @@ -269,8 +263,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterTaskInfoError) MesosSchedulerDriver driver2( &sched2, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched2, registered(&driver2, _, _)) - .Times(1); + EXPECT_CALL(sched2, registered(&driver2, _, _)); EXPECT_CALL(sched2, resourceOffers(&driver2, _)) .WillOnce(FutureArg<1>(&offers)) @@ -292,8 +285,7 @@ TEST_F(ResourceOffersTest, Request) { TestAllocator<master::allocator::HierarchicalDRFAllocator> allocator; - EXPECT_CALL(allocator, initialize(_, _, _, _, _)) - .Times(1); + EXPECT_CALL(allocator, initialize(_, _, _, _, _)); Try<Owned<cluster::Master>> master = StartMaster(&allocator); ASSERT_SOME(master); @@ -302,8 +294,7 @@ TEST_F(ResourceOffersTest, Request) MesosSchedulerDriver driver( &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(allocator, addFramework(_, _, _, _)) - .Times(1); + EXPECT_CALL(allocator, addFramework(_, _, _, _)); Future<Nothing> registered; EXPECT_CALL(sched, registered(&driver, _, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 946a7bc..0e29591 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -3785,8 +3785,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleSlaves) // Launch a long running task in the first slave. TaskInfo task1 = createTask(offers1.get()[0], "sleep 1000"); - EXPECT_CALL(sched, statusUpdate(_, _)) - .Times(1); + EXPECT_CALL(sched, statusUpdate(_, _)); Future<Nothing> _statusUpdateAcknowledgement1 = FUTURE_DISPATCH(slave1.get()->pid, &Slave::_statusUpdateAcknowledgement); @@ -3826,8 +3825,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleSlaves) // Launch a long running task in each slave. TaskInfo task2 = createTask(offers2.get()[0], "sleep 1000"); - EXPECT_CALL(sched, statusUpdate(_, _)) - .Times(1); + EXPECT_CALL(sched, statusUpdate(_, _)); Future<Nothing> _statusUpdateAcknowledgement2 = FUTURE_DISPATCH(slave2.get()->pid, &Slave::_statusUpdateAcknowledgement); http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index b6f7682..16bb14b 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -3016,8 +3016,8 @@ TEST_F(SlaveTest, HealthCheckUnregisterRace) SlaveID slaveId = offers.get()[0].slave_id(); - EXPECT_CALL(sched, offerRescinded(&driver, _)) - .Times(1); // Expect a single offer to be rescinded. + // Expect a single offer to be rescinded. + EXPECT_CALL(sched, offerRescinded(&driver, _)); Future<Nothing> slaveLost; EXPECT_CALL(sched, slaveLost(&driver, _)) http://git-wip-us.apache.org/repos/asf/mesos/blob/ad72a33b/src/tests/status_update_manager_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/status_update_manager_tests.cpp b/src/tests/status_update_manager_tests.cpp index 2d2f1ec..bfb471f 100644 --- a/src/tests/status_update_manager_tests.cpp +++ b/src/tests/status_update_manager_tests.cpp @@ -128,8 +128,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(StatusUpdateManagerTest, CheckpointStatusUpdate) AWAIT_READY(offers); EXPECT_NE(0u, offers.get().size()); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); @@ -206,8 +205,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate) MesosSchedulerDriver driver( &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL); - EXPECT_CALL(sched, registered(_, _, _)) - .Times(1); + EXPECT_CALL(sched, registered(_, _, _)); Future<vector<Offer>> offers; EXPECT_CALL(sched, resourceOffers(_, _)) @@ -219,8 +217,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate) AWAIT_READY(offers); EXPECT_NE(0u, offers.get().size()); - EXPECT_CALL(exec, registered(_, _, _, _)) - .Times(1); + EXPECT_CALL(exec, registered(_, _, _, _)); EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING));
