You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/07/22 06:17:50 UTC
[1/3] mesos git commit: Moved createLabel to protobuf_utils.
Repository: mesos
Updated Branches:
refs/heads/master 619f45f0f -> 940f52548
Moved createLabel to protobuf_utils.
Review: https://reviews.apache.org/r/36667
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/75ec6dc1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/75ec6dc1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/75ec6dc1
Branch: refs/heads/master
Commit: 75ec6dc1b67e2635d522135d4b53b812f1f776fa
Parents: 619f45f
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Tue Jul 21 21:17:08 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jul 21 21:17:11 2015 -0700
----------------------------------------------------------------------
src/common/protobuf_utils.cpp | 9 +++++++++
src/common/protobuf_utils.hpp | 3 +++
src/tests/hook_tests.cpp | 4 ++++
src/tests/master_tests.cpp | 3 +++
src/tests/mesos.hpp | 9 ---------
src/tests/slave_tests.cpp | 3 +++
6 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/75ec6dc1/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 9ba57a7..e0f82b5 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -190,6 +190,15 @@ MasterInfo createMasterInfo(const process::UPID& pid)
return info;
}
+
+Label createLabel(const std::string& key, const std::string& value)
+{
+ Label label;
+ label.set_key(key);
+ label.set_value(value);
+ return label;
+}
+
} // namespace protobuf {
} // namespace internal {
} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/75ec6dc1/src/common/protobuf_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.hpp b/src/common/protobuf_utils.hpp
index 64974c5..2e827a0 100644
--- a/src/common/protobuf_utils.hpp
+++ b/src/common/protobuf_utils.hpp
@@ -70,6 +70,9 @@ Option<bool> getTaskHealth(const Task& task);
// Helper function that creates a MasterInfo from UPID.
MasterInfo createMasterInfo(const process::UPID& pid);
+
+Label createLabel(const std::string& key, const std::string& value);
+
} // namespace protobuf {
} // namespace internal {
} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/75ec6dc1/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 6827dec..6b10db1 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -26,6 +26,8 @@
#include <stout/os.hpp>
#include <stout/try.hpp>
+#include "common/protobuf_utils.hpp"
+
#include "hook/manager.hpp"
#include "master/flags.hpp"
@@ -52,6 +54,8 @@ using namespace mesos::modules;
using mesos::internal::master::Master;
+using mesos::internal::protobuf::createLabel;
+
using mesos::internal::slave::Fetcher;
using mesos::internal::slave::MesosContainerizer;
using mesos::internal::slave::Slave;
http://git-wip-us.apache.org/repos/asf/mesos/blob/75ec6dc1/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 8a4e2c2..85cdffb 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -48,6 +48,7 @@
#include <stout/try.hpp>
#include "common/build.hpp"
+#include "common/protobuf_utils.hpp"
#include "master/flags.hpp"
#include "master/master.hpp"
@@ -68,6 +69,8 @@ using mesos::internal::master::Master;
using mesos::internal::master::allocator::MesosAllocatorProcess;
+using mesos::internal::protobuf::createLabel;
+
using mesos::internal::slave::GarbageCollectorProcess;
using mesos::internal::slave::Slave;
using mesos::internal::slave::Containerizer;
http://git-wip-us.apache.org/repos/asf/mesos/blob/75ec6dc1/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index f14b8f7..69134e1 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -1444,15 +1444,6 @@ void ExpectNoFutureUnionProtobufs(
// StatusUpdate came from the corresponding task.
MATCHER_P(TaskStatusEq, task, "") { return arg.task_id() == task.task_id(); }
-
-inline Label createLabel(const std::string& key, const std::string& value)
-{
- Label label;
- label.set_key(key);
- label.set_value(value);
- return label;
-}
-
} // namespace tests {
} // namespace internal {
} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/75ec6dc1/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 330a95b..bef5ddd 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -43,6 +43,7 @@
#include "common/build.hpp"
#include "common/http.hpp"
+#include "common/protobuf_utils.hpp"
#include "master/flags.hpp"
#include "master/master.hpp"
@@ -65,6 +66,8 @@ using namespace mesos::internal::slave;
using mesos::internal::master::Master;
+using mesos::internal::protobuf::createLabel;
+
using process::Clock;
using process::Future;
using process::PID;
[3/3] mesos git commit: Fixed the order of expected value in
EXPECT_EQ.
Posted by be...@apache.org.
Fixed the order of expected value in EXPECT_EQ.
The expected value should come first.
Review: https://reviews.apache.org/r/36669
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/940f5254
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/940f5254
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/940f5254
Branch: refs/heads/master
Commit: 940f5254858cb23d694fde315562c23d18dbc703
Parents: 923c156
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Tue Jul 21 21:17:39 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jul 21 21:17:41 2015 -0700
----------------------------------------------------------------------
src/tests/hook_tests.cpp | 24 ++++++++++++------------
src/tests/master_tests.cpp | 40 ++++++++++++++++++++++++----------------
src/tests/slave_tests.cpp | 30 ++++++++++++++++++------------
3 files changed, 54 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/940f5254/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 6b10db1..86e53d8 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -202,8 +202,8 @@ TEST_F(HookTest, VerifyMasterLaunchTaskHook)
const Labels &labels_ = runTaskMessage.get().task().labels();
ASSERT_EQ(1, labels_.labels_size());
- EXPECT_EQ(labels_.labels().Get(0).key(), testLabelKey);
- EXPECT_EQ(labels_.labels().Get(0).value(), testLabelValue);
+ EXPECT_EQ(testLabelKey, labels_.labels().Get(0).key());
+ EXPECT_EQ(testLabelValue, labels_.labels().Get(0).value());
driver.stop();
driver.join();
@@ -408,18 +408,18 @@ TEST_F(HookTest, VerifySlaveRunTaskHook)
ASSERT_EQ(3, labels_.labels_size());
// The slave run task hook will prepend a new "baz":"qux" label.
- EXPECT_EQ(labels_.labels(0).key(), "baz");
- EXPECT_EQ(labels_.labels(0).value(), "qux");
+ EXPECT_EQ("baz", labels_.labels(0).key());
+ EXPECT_EQ("qux", labels_.labels(0).value());
// Master launch task hook will still hang off test label.
- EXPECT_EQ(labels_.labels(1).key(), testLabelKey);
- EXPECT_EQ(labels_.labels(1).value(), testLabelValue);
+ EXPECT_EQ(testLabelKey, labels_.labels(1).key());
+ EXPECT_EQ(testLabelValue, labels_.labels(1).value());
// And lastly, we only expect the "foo":"bar" pair to be stripped by
// the module. The last pair should be the original "bar":"baz"
// pair set by the test.
- EXPECT_EQ(labels_.labels(2).key(), "bar");
- EXPECT_EQ(labels_.labels(2).value(), "baz");
+ EXPECT_EQ("bar", labels_.labels(2).key());
+ EXPECT_EQ("baz", labels_.labels(2).value());
driver.stop();
driver.join();
@@ -510,14 +510,14 @@ TEST_F(HookTest, VerifySlaveTaskStatusLabelDecorator)
EXPECT_EQ(2, labels_.labels_size());
// The test hook will prepend a new "baz":"qux" label.
- EXPECT_EQ(labels_.labels(0).key(), "bar");
- EXPECT_EQ(labels_.labels(0).value(), "qux");
+ EXPECT_EQ("bar", labels_.labels(0).key());
+ EXPECT_EQ("qux", labels_.labels(0).value());
// And lastly, we only expect the "foo":"bar" pair to be stripped by
// the module. The last pair should be the original "bar":"baz"
// pair set by the test.
- EXPECT_EQ(labels_.labels(1).key(), "bar");
- EXPECT_EQ(labels_.labels(1).value(), "baz");
+ EXPECT_EQ("bar", labels_.labels(1).key());
+ EXPECT_EQ("baz", labels_.labels(1).value());
driver.stop();
driver.join();
http://git-wip-us.apache.org/repos/asf/mesos/blob/940f5254/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 42dde0f..8b8d386 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -3112,12 +3112,15 @@ TEST_F(MasterTest, TaskLabels)
JSON::Array labelsObject = find.get();
// Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs.
- EXPECT_EQ(labelsObject.values[0],
- JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject.values[1],
- JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject.values[2],
- JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))),
+ labelsObject.values[0]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))),
+ labelsObject.values[1]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))),
+ labelsObject.values[2]);
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -3214,12 +3217,15 @@ TEST_F(MasterTest, TaskStatusLabels)
JSON::Array labelsObject = find.get();
// Verify the content of 'foo:bar' pair.
- EXPECT_EQ(labelsObject.values[0],
- JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject.values[1],
- JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject.values[2],
- JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))),
+ labelsObject.values[0]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))),
+ labelsObject.values[1]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))),
+ labelsObject.values[2]);
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -3454,12 +3460,14 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
EXPECT_EQ(2u, labelsArray.values.size());
// Verify the content of 'clearance:high' pair.
- EXPECT_EQ(labelsArray.values[0],
- JSON::Value(JSON::Protobuf(createLabel("clearance", "high"))));
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("clearance", "high"))),
+ labelsArray.values[0]);
// Verify the content of 'RPC:yes' pair.
- EXPECT_EQ(labelsArray.values[1],
- JSON::Value(JSON::Protobuf(createLabel("RPC", "yes"))));
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("RPC", "yes"))),
+ labelsArray.values[1]);
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
http://git-wip-us.apache.org/repos/asf/mesos/blob/940f5254/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 73afb6e..e1390ad 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -2128,12 +2128,15 @@ TEST_F(SlaveTest, TaskLabels)
JSON::Array labelsObject = find.get();
// Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs.
- EXPECT_EQ(labelsObject.values[0],
- JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject.values[1],
- JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject.values[2],
- JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))),
+ labelsObject.values[0]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))),
+ labelsObject.values[1]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))),
+ labelsObject.values[2]);
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -2230,12 +2233,15 @@ TEST_F(SlaveTest, TaskStatusLabels)
JSON::Array labelsObject = find.get();
// Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs.
- EXPECT_EQ(labelsObject.values[0],
- JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject.values[1],
- JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject.values[2],
- JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))),
+ labelsObject.values[0]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))),
+ labelsObject.values[1]);
+ EXPECT_EQ(
+ JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))),
+ labelsObject.values[2]);
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
[2/3] mesos git commit: Removed some trailing underscores from
{master, slave}_tests.cpp.
Posted by be...@apache.org.
Removed some trailing underscores from {master,slave}_tests.cpp.
Review: https://reviews.apache.org/r/36668
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/923c1568
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/923c1568
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/923c1568
Branch: refs/heads/master
Commit: 923c1568e2217d844997524c0539b47b538dae46
Parents: 75ec6dc
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Tue Jul 21 21:17:22 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jul 21 21:17:24 2015 -0700
----------------------------------------------------------------------
src/tests/master_tests.cpp | 61 ++++++++++++++++++++---------------------
src/tests/slave_tests.cpp | 24 ++++++++--------
2 files changed, 42 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/923c1568/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 85cdffb..42dde0f 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -2988,16 +2988,15 @@ TEST_F(MasterTest, FrameworkWebUIUrlandCapabilities)
process::http::get(master.get(), "state.json");
AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, masterState);
- Try<JSON::Object> masterStateObject =
- JSON::parse<JSON::Object>(masterState.get().body);
- ASSERT_SOME(masterStateObject);
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(masterState.get().body);
+ ASSERT_SOME(parse);
- // We need a mutable copy of masterStateObject to use [].
- JSON::Object masterStateObject_ = masterStateObject.get();
+ // We need a mutable copy of parse to use [].
+ JSON::Object masterStateObject = parse.get();
- EXPECT_EQ(1u, masterStateObject_.values.count("frameworks"));
+ EXPECT_EQ(1u, masterStateObject.values.count("frameworks"));
JSON::Array frameworks =
- masterStateObject_.values["frameworks"].as<JSON::Array>();
+ masterStateObject.values["frameworks"].as<JSON::Array>();
EXPECT_EQ(1u, frameworks.values.size());
JSON::Object framework_ = frameworks.values.front().as<JSON::Object>();
@@ -3106,18 +3105,18 @@ TEST_F(MasterTest, TaskLabels)
Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
ASSERT_SOME(parse);
- Result<JSON::Array> labelsObject = parse.get().find<JSON::Array>(
+ Result<JSON::Array> find = parse.get().find<JSON::Array>(
"frameworks[0].tasks[0].labels");
- EXPECT_SOME(labelsObject);
+ EXPECT_SOME(find);
- JSON::Array labelsObject_ = labelsObject.get();
+ JSON::Array labelsObject = find.get();
// Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs.
- EXPECT_EQ(labelsObject_.values[0],
+ EXPECT_EQ(labelsObject.values[0],
JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject_.values[1],
+ EXPECT_EQ(labelsObject.values[1],
JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject_.values[2],
+ EXPECT_EQ(labelsObject.values[2],
JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
EXPECT_CALL(exec, shutdown(_))
@@ -3208,18 +3207,18 @@ TEST_F(MasterTest, TaskStatusLabels)
Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
ASSERT_SOME(parse);
- Result<JSON::Array> labelsObject = parse.get().find<JSON::Array>(
+ Result<JSON::Array> find = parse.get().find<JSON::Array>(
"frameworks[0].tasks[0].statuses[0].labels");
- EXPECT_SOME(labelsObject);
+ EXPECT_SOME(find);
- JSON::Array labelsObject_ = labelsObject.get();
+ JSON::Array labelsObject = find.get();
// Verify the content of 'foo:bar' pair.
- EXPECT_EQ(labelsObject_.values[0],
+ EXPECT_EQ(labelsObject.values[0],
JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject_.values[1],
+ EXPECT_EQ(labelsObject.values[1],
JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject_.values[2],
+ EXPECT_EQ(labelsObject.values[2],
JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
EXPECT_CALL(exec, shutdown(_))
@@ -3419,12 +3418,12 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
ASSERT_EQ("v0.1.1", version.get());
// Verify content of two named ports.
- Result<JSON::Array> portsArray = parse.get().find<JSON::Array>(
+ Result<JSON::Array> find1 = parse.get().find<JSON::Array>(
"frameworks[0].tasks[0].discovery.ports.ports");
- EXPECT_SOME(portsArray);
+ EXPECT_SOME(find1);
- JSON::Array portsArray_ = portsArray.get();
- EXPECT_EQ(2u, portsArray_.values.size());
+ JSON::Array portsArray = find1.get();
+ EXPECT_EQ(2u, portsArray.values.size());
// Verify the content of '8888:myport1:tcp' port.
Try<JSON::Value> expected = JSON::parse(
@@ -3434,7 +3433,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
" \"protocol\":\"tcp\""
"}");
ASSERT_SOME(expected);
- EXPECT_EQ(expected.get(), portsArray_.values[0]);
+ EXPECT_EQ(expected.get(), portsArray.values[0]);
// Verify the content of '9999:myport2:udp' port.
expected = JSON::parse(
@@ -3444,22 +3443,22 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
" \"protocol\":\"udp\""
"}");
ASSERT_SOME(expected);
- EXPECT_EQ(expected.get(), portsArray_.values[1]);
+ EXPECT_EQ(expected.get(), portsArray.values[1]);
// Verify content of two labels.
- Result<JSON::Array> labelsArray = parse.get().find<JSON::Array>(
+ Result<JSON::Array> find2 = parse.get().find<JSON::Array>(
"frameworks[0].tasks[0].discovery.labels.labels");
- EXPECT_SOME(labelsArray);
+ EXPECT_SOME(find2);
- JSON::Array labelsArray_ = labelsArray.get();
- EXPECT_EQ(2u, labelsArray_.values.size());
+ JSON::Array labelsArray = find2.get();
+ EXPECT_EQ(2u, labelsArray.values.size());
// Verify the content of 'clearance:high' pair.
- EXPECT_EQ(labelsArray_.values[0],
+ EXPECT_EQ(labelsArray.values[0],
JSON::Value(JSON::Protobuf(createLabel("clearance", "high"))));
// Verify the content of 'RPC:yes' pair.
- EXPECT_EQ(labelsArray_.values[1],
+ EXPECT_EQ(labelsArray.values[1],
JSON::Value(JSON::Protobuf(createLabel("RPC", "yes"))));
EXPECT_CALL(exec, shutdown(_))
http://git-wip-us.apache.org/repos/asf/mesos/blob/923c1568/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index bef5ddd..73afb6e 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -2121,18 +2121,18 @@ TEST_F(SlaveTest, TaskLabels)
Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
ASSERT_SOME(parse);
- Result<JSON::Array> labelsObject = parse.get().find<JSON::Array>(
+ Result<JSON::Array> find = parse.get().find<JSON::Array>(
"frameworks[0].executors[0].tasks[0].labels");
- EXPECT_SOME(labelsObject);
+ EXPECT_SOME(find);
- JSON::Array labelsObject_ = labelsObject.get();
+ JSON::Array labelsObject = find.get();
// Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs.
- EXPECT_EQ(labelsObject_.values[0],
+ EXPECT_EQ(labelsObject.values[0],
JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject_.values[1],
+ EXPECT_EQ(labelsObject.values[1],
JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject_.values[2],
+ EXPECT_EQ(labelsObject.values[2],
JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
EXPECT_CALL(exec, shutdown(_))
@@ -2223,18 +2223,18 @@ TEST_F(SlaveTest, TaskStatusLabels)
Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
ASSERT_SOME(parse);
- Result<JSON::Array> labelsObject = parse.get().find<JSON::Array>(
+ Result<JSON::Array> find = parse.get().find<JSON::Array>(
"frameworks[0].executors[0].tasks[0].statuses[0].labels");
- EXPECT_SOME(labelsObject);
+ EXPECT_SOME(find);
- JSON::Array labelsObject_ = labelsObject.get();
+ JSON::Array labelsObject = find.get();
// Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs.
- EXPECT_EQ(labelsObject_.values[0],
+ EXPECT_EQ(labelsObject.values[0],
JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))));
- EXPECT_EQ(labelsObject_.values[1],
+ EXPECT_EQ(labelsObject.values[1],
JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))));
- EXPECT_EQ(labelsObject_.values[2],
+ EXPECT_EQ(labelsObject.values[2],
JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))));
EXPECT_CALL(exec, shutdown(_))