Changed tests to use Labels. Review: https://reviews.apache.org/r/28577
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/65bf0f81 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/65bf0f81 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/65bf0f81 Branch: refs/heads/master Commit: 65bf0f81fbae51eedf8e497ab45d439128ecb377 Parents: 1b3d171 Author: Niklas Nielsen <[email protected]> Authored: Wed Dec 3 16:38:48 2014 -0800 Committer: Niklas Q. Nielsen <[email protected]> Committed: Wed Dec 3 17:11:22 2014 -0800 ---------------------------------------------------------------------- src/tests/master_tests.cpp | 8 +++++--- src/tests/slave_tests.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/65bf0f81/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 56cba65..4be4815 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -2580,15 +2580,17 @@ TEST_F(MasterTest, TaskLabels) task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); // Add three labels to the task (two of which share the same key). - Label* label1 = task.add_labels(); + Labels* labels = task.mutable_labels(); + + Label* label1 = labels->add_labels(); label1->set_key("foo"); label1->set_value("bar"); - Label* label2 = task.add_labels(); + Label* label2 = labels->add_labels(); label2->set_key("bar"); label2->set_value("baz"); - Label* label3 = task.add_labels(); + Label* label3 = labels->add_labels(); label3->set_key("bar"); label3->set_value("qux"); http://git-wip-us.apache.org/repos/asf/mesos/blob/65bf0f81/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 3b80ca9..f2896a1 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -1442,15 +1442,17 @@ TEST_F(SlaveTest, TaskLabels) task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO); // Add three labels to the task (two of which share the same key). - Label* label1 = task.add_labels(); + Labels* labels = task.mutable_labels(); + + Label* label1 = labels->add_labels(); label1->set_key("foo"); label1->set_value("bar"); - Label* label2 = task.add_labels(); + Label* label2 = labels->add_labels(); label2->set_key("bar"); label2->set_value("baz"); - Label* label3 = task.add_labels(); + Label* label3 = labels->add_labels(); label3->set_key("bar"); label3->set_value("qux");
