You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/07/18 19:04:29 UTC
mesos git commit: Removed trailing semi-colons in resource strings.
Repository: mesos
Updated Branches:
refs/heads/master 7a4746e29 -> 7cb67544d
Removed trailing semi-colons in resource strings.
Review: https://reviews.apache.org/r/50061/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7cb67544
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7cb67544
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7cb67544
Branch: refs/heads/master
Commit: 7cb67544d4df7e3faf49cdb86b76a7cbbcb23679
Parents: 7a4746e
Author: Guangya Liu <gy...@gmail.com>
Authored: Mon Jul 18 12:04:08 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Jul 18 12:04:08 2016 -0700
----------------------------------------------------------------------
src/tests/containerizer/docker_containerizer_tests.cpp | 6 +++---
src/tests/containerizer/nvidia_gpu_isolator_tests.cpp | 2 +-
src/tests/hierarchical_allocator_tests.cpp | 4 ++--
src/tests/resources_tests.cpp | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7cb67544/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 4d049ed..4e5b1fd 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -1513,7 +1513,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchWithPersistentVolumes)
task.mutable_task_id()->set_value("1");
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(
- Resources::parse("cpus:1;mem:64;").get() + volume);
+ Resources::parse("cpus:1;mem:64").get() + volume);
CommandInfo command;
command.set_value("echo abc > " +
@@ -1673,7 +1673,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverPersistentVolumes)
task.mutable_task_id()->set_value("1");
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(
- Resources::parse("cpus:1;mem:64;").get() + volume);
+ Resources::parse("cpus:1;mem:64").get() + volume);
CommandInfo command;
command.set_value("sleep 1000");
@@ -1835,7 +1835,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
task.mutable_task_id()->set_value("1");
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(
- Resources::parse("cpus:1;mem:64;").get() + volume);
+ Resources::parse("cpus:1;mem:64").get() + volume);
CommandInfo command;
command.set_value("sleep 1000");
http://git-wip-us.apache.org/repos/asf/mesos/blob/7cb67544/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp b/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
index 7944c0d..02d82e3 100644
--- a/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
+++ b/src/tests/containerizer/nvidia_gpu_isolator_tests.cpp
@@ -127,7 +127,7 @@ TEST_F(NvidiaGpuTest, ROOT_CGROUPS_NVIDIA_GPU_VerifyDeviceAccess)
TaskInfo task1 = createTask(
offers1.get()[0].slave_id(),
- Resources::parse("cpus:0.1;mem:128;").get(),
+ Resources::parse("cpus:0.1;mem:128").get(),
"nvidia-smi");
Future<TaskStatus> statusRunning1, statusFailed1;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7cb67544/src/tests/hierarchical_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hierarchical_allocator_tests.cpp b/src/tests/hierarchical_allocator_tests.cpp
index 375a909..acdd15a 100644
--- a/src/tests/hierarchical_allocator_tests.cpp
+++ b/src/tests/hierarchical_allocator_tests.cpp
@@ -3441,7 +3441,7 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, DeclineOffers)
}
Resources resources = Resources::parse(
- "cpus:16;mem:2014;disk:1024;").get();
+ "cpus:16;mem:2014;disk:1024").get();
Resources ports = makePortRanges(makeRange(31000, 32000), 16);
resources += ports;
@@ -3580,7 +3580,7 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, ResourceLabels)
// worst-case for the equality operator. We also ensure that the
// labels at any two nodes are distinct, which means they can't be
// aggregated easily by the master/allocator.
- Resources resources = Resources::parse("mem:2014;disk:1024;").get();
+ Resources resources = Resources::parse("mem:2014;disk:1024").get();
Resources ports = makePortRanges(makeRange(31000, 32000), 16);
resources += ports;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7cb67544/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 40d290a..4111e08 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -1458,9 +1458,9 @@ TEST(ResourcesTest, Reservations)
Resources unreserved = Resources::parse(
"cpus:1;mem:2;disk:4").get();
Resources role1 = Resources::parse(
- "cpus(role1):2;mem(role1):4;disk(role1):8;").get();
+ "cpus(role1):2;mem(role1):4;disk(role1):8").get();
Resources role2 = Resources::parse(
- "cpus(role2):4;mem(role2):8;disk(role2):6;").get();
+ "cpus(role2):4;mem(role2):8;disk(role2):6").get();
Resources resources = unreserved + role1 + role2;