You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2016/03/09 09:51:10 UTC
[2/4] mesos git commit: Removed redundant CreateMasterFlags in
StartMaster calls.
Removed redundant CreateMasterFlags in StartMaster calls.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/feef2477
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/feef2477
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/feef2477
Branch: refs/heads/master
Commit: feef247770034865aa435eb6c3093b390280eb50
Parents: 0d0658d
Author: Adam B <ad...@mesosphere.io>
Authored: Tue Mar 8 23:42:27 2016 -0800
Committer: Adam B <ad...@mesosphere.io>
Committed: Tue Mar 8 23:42:27 2016 -0800
----------------------------------------------------------------------
src/tests/containerizer/port_mapping_tests.cpp | 2 +-
src/tests/hook_tests.cpp | 4 ++--
src/tests/persistent_volume_tests.cpp | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/feef2477/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 983a633..a1427fd 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -2218,7 +2218,7 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink)
// described in MESOS-2914.
TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
slave::Flags flags = CreateSlaveFlags();
http://git-wip-us.apache.org/repos/asf/mesos/blob/feef2477/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 88ad780..bb287c7 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -142,7 +142,7 @@ TEST_F(HookTest, HookLoading)
// taskinfo message during master launch task.
TEST_F(HookTest, VerifyMasterLaunchTaskHook)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
MockExecutor exec(DEFAULT_EXECUTOR_ID);
@@ -739,7 +739,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerHook)
// propagated to the resource offer.
TEST_F(HookTest, VerifySlaveResourcesAndAttributesDecorator)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
MockExecutor exec(DEFAULT_EXECUTOR_ID);
http://git-wip-us.apache.org/repos/asf/mesos/blob/feef2477/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index f25d59b..e9215de 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -259,7 +259,7 @@ TEST_P(PersistentVolumeTest, SendingCheckpointResourcesMessage)
// sends them to the master during re-registration.
TEST_P(PersistentVolumeTest, ResourcesCheckpointing)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();
@@ -325,7 +325,7 @@ TEST_P(PersistentVolumeTest, ResourcesCheckpointing)
TEST_P(PersistentVolumeTest, PreparePersistentVolume)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();
@@ -487,7 +487,7 @@ TEST_P(PersistentVolumeTest, MasterFailover)
// slave resources specified using the '--resources' flag.
TEST_P(PersistentVolumeTest, IncompatibleCheckpointedResources)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();
@@ -574,7 +574,7 @@ TEST_P(PersistentVolumeTest, IncompatibleCheckpointedResources)
// the container path it specifies.
TEST_P(PersistentVolumeTest, AccessPersistentVolume)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();
@@ -680,7 +680,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
// slave finishes recovery.
TEST_P(PersistentVolumeTest, SlaveRecovery)
{
- Try<PID<Master>> master = StartMaster(CreateMasterFlags());
+ Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();