Repository: mesos Updated Branches: refs/heads/master 5eaa702c2 -> 2db8ac414
Cleaned up Maintenance test TODOs. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2db8ac41 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2db8ac41 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2db8ac41 Branch: refs/heads/master Commit: 2db8ac414e99bbf0307afaa491ce399010649b5c Parents: 5eaa702 Author: Joris Van Remoortere <[email protected]> Authored: Fri Sep 18 17:21:43 2015 -0400 Committer: Joris Van Remoortere <[email protected]> Committed: Fri Sep 18 17:21:43 2015 -0400 ---------------------------------------------------------------------- src/tests/hierarchical_allocator_tests.cpp | 4 +--- src/tests/master_maintenance_tests.cpp | 16 ++++------------ 2 files changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/2db8ac41/src/tests/hierarchical_allocator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/hierarchical_allocator_tests.cpp b/src/tests/hierarchical_allocator_tests.cpp index 72e6273..505b9de 100644 --- a/src/tests/hierarchical_allocator_tests.cpp +++ b/src/tests/hierarchical_allocator_tests.cpp @@ -445,9 +445,7 @@ TEST_F(HierarchicalAllocatorTest, MaintenanceInverseOffers) EXPECT_EQ(framework1.id(), allocation.get().frameworkId); EXPECT_EQ(agent.resources(), Resources::sum(allocation.get().resources)); - // TODO(jmlvanre): Replace Time(0.0) with `Clock::now()` once JSON double - // conversion is fixed. For now using a rounded time avoids the issue. - const process::Time start = process::Time::create(0.0).get() + Seconds(60); + const process::Time start = Clock::now() + Seconds(60); // Give the agent some unavailability. allocator->updateUnavailability( http://git-wip-us.apache.org/repos/asf/mesos/blob/2db8ac41/src/tests/master_maintenance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_maintenance_tests.cpp b/src/tests/master_maintenance_tests.cpp index 2a41e7e..9892bc3 100644 --- a/src/tests/master_maintenance_tests.cpp +++ b/src/tests/master_maintenance_tests.cpp @@ -432,9 +432,7 @@ TEST_F(MasterMaintenanceTest, PendingUnavailabilityTest) machine.set_hostname(maintenanceHostname); machine.set_ip(stringify(slave.get().address.ip)); - // TODO(jmlvanre): Replace Time(0.0) with `Clock::now()` once JSON double - // conversion is fixed. For now using a rounded time avoids the issue. - const Time start = Time::create(0.0).get() + Seconds(60); + const Time start = Clock::now() + Seconds(60); const Duration duration = Seconds(120); const Unavailability unavailability = createUnavailability(start, duration); @@ -543,9 +541,7 @@ TEST_F(MasterMaintenanceTest, PreV1SchedulerSupport) machine.set_hostname(maintenanceHostname); machine.set_ip(stringify(slave.get().address.ip)); - // TODO(jmlvanre): Replace Time(0.0) with `Clock::now()` once JSON double - // conversion is fixed. For now using a rounded time avoids the issue. - const Time start = Time::create(0.0).get() + Seconds(60); + const Time start = Clock::now() + Seconds(60); const Duration duration = Seconds(120); const Unavailability unavailability = createUnavailability(start, duration); @@ -638,9 +634,7 @@ TEST_F(MasterMaintenanceTest, EnterMaintenanceMode) machine.set_hostname(maintenanceHostname); machine.set_ip(stringify(slave.get().address.ip)); - // TODO(jmlvanre): Replace Time(0.0) with `Clock::now()` once JSON double - // conversion is fixed. For now using a rounded time avoids the issue. - const Time start = Time::create(0.0).get() + Seconds(60); + const Time start = Clock::now() + Seconds(60); const Duration duration = Seconds(120); const Unavailability unavailability = createUnavailability(start, duration); @@ -1050,9 +1044,7 @@ TEST_F(MasterMaintenanceTest, InverseOffers) machine.set_hostname(maintenanceHostname); machine.set_ip(stringify(slave.get().address.ip)); - // TODO(josephw): Replace Time(0.0) with `Clock::now()` once JSON double - // conversion is fixed. For now using a rounded time avoids the issue. - const Time start = Time::create(0.0).get() + Seconds(60); + const Time start = Clock::now() + Seconds(60); const Duration duration = Seconds(120); const Unavailability unavailability = createUnavailability(start, duration);
