Repository: mesos Updated Branches: refs/heads/master 1cbda33bb -> a1c6a7a3c
Revert "Removed redundant master flags in resource provider tests." This reverts commit b1538db6b9d12633195e0d5a0eff48246ea0d4ad. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0f3ec500 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0f3ec500 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0f3ec500 Branch: refs/heads/master Commit: 0f3ec500d04c860b2334e6bea040f718dfece555 Parents: 1cbda33 Author: Alexander Rukletsov <[email protected]> Authored: Wed Apr 25 17:07:01 2018 +0200 Committer: Alexander Rukletsov <[email protected]> Committed: Wed Apr 25 17:07:01 2018 +0200 ---------------------------------------------------------------------- src/tests/resource_provider_manager_tests.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0f3ec500/src/tests/resource_provider_manager_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/resource_provider_manager_tests.cpp b/src/tests/resource_provider_manager_tests.cpp index 889cb32..1ee4dc3 100644 --- a/src/tests/resource_provider_manager_tests.cpp +++ b/src/tests/resource_provider_manager_tests.cpp @@ -914,7 +914,8 @@ TEST_F(ResourceProviderRegistrarTest, MasterRegistrar) TEST_P(ResourceProviderManagerHttpApiTest, ConvertResources) { // Start master and agent. - Try<Owned<cluster::Master>> master = StartMaster(); + master::Flags masterFlags = CreateMasterFlags(); + Try<Owned<cluster::Master>> master = StartMaster(masterFlags); ASSERT_SOME(master); Owned<MasterDetector> detector = master.get()->createDetector(); @@ -1049,7 +1050,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, ResubscribeResourceProvider) Clock::pause(); // Start master and agent. - Try<Owned<cluster::Master>> master = StartMaster(); + master::Flags masterFlags = CreateMasterFlags(); + Try<Owned<cluster::Master>> master = StartMaster(masterFlags); ASSERT_SOME(master); Owned<MasterDetector> detector = master.get()->createDetector(); @@ -1303,7 +1305,8 @@ TEST_F(ResourceProviderManagerHttpApiTest, ResourceProviderSubscribeDisconnect) Clock::pause(); // Start master and agent. - Try<Owned<cluster::Master>> master = StartMaster(); + master::Flags masterFlags = CreateMasterFlags(); + Try<Owned<cluster::Master>> master = StartMaster(masterFlags); ASSERT_SOME(master); Owned<MasterDetector> detector = master.get()->createDetector(); @@ -1379,7 +1382,8 @@ TEST_F(ResourceProviderManagerHttpApiTest, Metrics) Clock::pause(); // Start master and agent. - Try<Owned<cluster::Master>> master = StartMaster(); + master::Flags masterFlags = CreateMasterFlags(); + Try<Owned<cluster::Master>> master = StartMaster(masterFlags); ASSERT_SOME(master); Owned<MasterDetector> detector = master.get()->createDetector();
