You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/09/23 22:12:08 UTC
mesos git commit: Renamed `DEFAULT_ROLE` to `DEFAULT_TEST_ROLE` in
`src/tests/mesos.hpp`.
Repository: mesos
Updated Branches:
refs/heads/master bfd6f6656 -> 7c833abbe
Renamed `DEFAULT_ROLE` to `DEFAULT_TEST_ROLE` in `src/tests/mesos.hpp`.
This changes the `DEFAULT_ROLE` constant to `DEFAULT_TEST_ROLE`
to avoid confusion with master's `--default_role`.
Review: https://reviews.apache.org/r/52222/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c833abb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c833abb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c833abb
Branch: refs/heads/master
Commit: 7c833abbec9c9e4eb51d67f7a8e7a8d0870825f8
Parents: bfd6f66
Author: Greg Mann <gr...@mesosphere.io>
Authored: Fri Sep 23 23:43:12 2016 +0200
Committer: Michael Park <mp...@apache.org>
Committed: Fri Sep 23 23:44:34 2016 +0200
----------------------------------------------------------------------
src/tests/mesos.hpp | 2 +-
src/tests/persistent_volume_tests.cpp | 48 +++++++++++++++---------------
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c833abb/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 3cd63bd..3876a08 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -93,7 +93,7 @@ namespace tests {
constexpr char READONLY_HTTP_AUTHENTICATION_REALM[] = "test-readonly-realm";
constexpr char READWRITE_HTTP_AUTHENTICATION_REALM[] = "test-readwrite-realm";
-constexpr char DEFAULT_ROLE[] = "default-role";
+constexpr char DEFAULT_TEST_ROLE[] = "default-role";
// Forward declarations.
class MockExecutor;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c833abb/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index a726d78..2ab44d1 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -166,7 +166,7 @@ protected:
case NONE: {
diskResource = createDiskResource(
stringify(mb.megabytes()),
- DEFAULT_ROLE,
+ DEFAULT_TEST_ROLE,
None(),
None());
@@ -175,7 +175,7 @@ protected:
case PATH: {
diskResource = createDiskResource(
stringify(mb.megabytes()),
- DEFAULT_ROLE,
+ DEFAULT_TEST_ROLE,
None(),
None(),
createDiskSourcePath(path::join(diskPath, "disk" + stringify(id))));
@@ -185,7 +185,7 @@ protected:
case MOUNT: {
diskResource = createDiskResource(
stringify(mb.megabytes()),
- DEFAULT_ROLE,
+ DEFAULT_TEST_ROLE,
None(),
None(),
createDiskSourceMount(
@@ -254,7 +254,7 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
Clock::pause();
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
@@ -429,7 +429,7 @@ TEST_P(PersistentVolumeTest, ResourcesCheckpointing)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -495,7 +495,7 @@ TEST_P(PersistentVolumeTest, PreparePersistentVolume)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -564,7 +564,7 @@ TEST_P(PersistentVolumeTest, MasterFailover)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
MockScheduler sched;
TestingMesosSchedulerDriver driver(&sched, &detector, frameworkInfo);
@@ -659,7 +659,7 @@ TEST_P(PersistentVolumeTest, IncompatibleCheckpointedResources)
spawn(slave1);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -746,7 +746,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -900,14 +900,14 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleTasks)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.resources =
- "cpus:2;mem:1024;disk(" + string(DEFAULT_ROLE) + "):1024";
+ "cpus:2;mem:1024;disk(" + string(DEFAULT_TEST_ROLE) + "):1024";
Owned<MasterDetector> detector = master.get()->createDetector();
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -933,7 +933,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleTasks)
Resources volume = createPersistentVolume(
Megabytes(64),
- DEFAULT_ROLE,
+ DEFAULT_TEST_ROLE,
"id1",
"path1",
None(),
@@ -941,8 +941,8 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleTasks)
frameworkInfo.principal(),
true); // Shared.
- Try<Resources> taskResources1 =
- Resources::parse("cpus:1;mem:128;disk(" + string(DEFAULT_ROLE) + "):32");
+ Try<Resources> taskResources1 = Resources::parse(
+ "cpus:1;mem:128;disk(" + string(DEFAULT_TEST_ROLE) + "):32");
// Create 2 tasks which write distinct files in the shared volume.
TaskInfo task1 = createTask(
@@ -950,8 +950,8 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleTasks)
taskResources1.get() + volume,
"echo task1 > path1/file1");
- Try<Resources> taskResources2 =
- Resources::parse("cpus:1;mem:256;disk(" + string(DEFAULT_ROLE) + "):64");
+ Try<Resources> taskResources2 = Resources::parse(
+ "cpus:1;mem:256;disk(" + string(DEFAULT_TEST_ROLE) + "):64");
TaskInfo task2 = createTask(
offer.slave_id(),
@@ -988,7 +988,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleTasks)
const string& volumePath = slave::paths::getPersistentVolumePath(
slaveFlags.work_dir,
- DEFAULT_ROLE,
+ DEFAULT_TEST_ROLE,
"id1");
EXPECT_SOME_EQ("task1\n", os::read(path::join(volumePath, "file1")));
@@ -1018,7 +1018,7 @@ TEST_P(PersistentVolumeTest, SlaveRecovery)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
frameworkInfo.set_checkpoint(true);
MockScheduler sched;
@@ -1152,7 +1152,7 @@ TEST_P(PersistentVolumeTest, GoodACLCreateThenDestroy)
filters.set_refuse_seconds(0);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
@@ -1298,7 +1298,7 @@ TEST_P(PersistentVolumeTest, GoodACLNoPrincipal)
FrameworkInfo frameworkInfo;
frameworkInfo.set_name("no-principal");
frameworkInfo.set_user(os::user().get());
- frameworkInfo.set_role(DEFAULT_ROLE);
+ frameworkInfo.set_role(DEFAULT_TEST_ROLE);
// Create a master. Since the framework has no
// principal, we don't authenticate frameworks.
@@ -1452,11 +1452,11 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
FrameworkInfo frameworkInfo1;
frameworkInfo1.set_name("no-principal");
frameworkInfo1.set_user(os::user().get());
- frameworkInfo1.set_role(DEFAULT_ROLE);
+ frameworkInfo1.set_role(DEFAULT_TEST_ROLE);
// Create a `FrameworkInfo` with a principal.
FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo2.set_role(DEFAULT_ROLE);
+ frameworkInfo2.set_role(DEFAULT_TEST_ROLE);
// Create a master. Since one framework has no
// principal, we don't authenticate frameworks.
@@ -1667,13 +1667,13 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
// Create a `FrameworkInfo` that cannot create or destroy volumes.
FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo1.set_role(DEFAULT_ROLE);
+ frameworkInfo1.set_role(DEFAULT_TEST_ROLE);
// Create a `FrameworkInfo` that can create volumes.
FrameworkInfo frameworkInfo2;
frameworkInfo2.set_name("creator-framework");
frameworkInfo2.set_user(os::user().get());
- frameworkInfo2.set_role(DEFAULT_ROLE);
+ frameworkInfo2.set_role(DEFAULT_TEST_ROLE);
frameworkInfo2.set_principal("creator-principal");
// Create a master.