mesos git commit: Minor cleanups to FrameworkInfo role(s) validation tests.

[bm...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 50da24ed9 -> 18273e1d4


Minor cleanups to FrameworkInfo role(s) validation tests.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/18273e1d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/18273e1d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/18273e1d

Branch: refs/heads/master
Commit: 18273e1d42304d15a478898cb0a82eeff77b92bc
Parents: 50da24e
Author: Benjamin Mahler <bm...@apache.org>
Authored: Fri Dec 2 18:12:10 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Dec 2 18:12:10 2016 -0800

----------------------------------------------------------------------
 src/tests/master_validation_tests.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/18273e1d/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 49ed6cc..c01893e 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -2363,20 +2363,22 @@ TEST_F(TaskGroupValidationTest, TaskUsesDifferentExecutor)
 class FrameworkInfoValidationTest : public MesosTest {};
 
 
-// This tests the validateRoles function of FrameworkInfo.
+// This tests the role validation for FrameworkInfo.
 TEST_F(FrameworkInfoValidationTest, ValidateRoles)
 {
   // Not MULTI_ROLE, no 'role' (default to "*"), no 'roles'.
   {
     FrameworkInfo frameworkInfo;
+
     EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo));
   }
 
-  // Not MULTI_ROLE, no 'role' (default to "*"), has 'roles'.
+  // Not MULTI_ROLE, no 'role' (default to "*"), has 'roles' (error!).
   {
     FrameworkInfo frameworkInfo;
     frameworkInfo.add_roles("bar");
     frameworkInfo.add_roles("qux");
+
     EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo));
   }
 
@@ -2384,15 +2386,17 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles)
   {
     FrameworkInfo frameworkInfo;
     frameworkInfo.set_role("foo");
+
     EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo));
   }
 
-  // Not MULTI_ROLE, has 'role', has 'roles'.
+  // Not MULTI_ROLE, has 'role', has 'roles' (error!).
   {
     FrameworkInfo frameworkInfo;
     frameworkInfo.add_roles("bar");
     frameworkInfo.add_roles("qux");
     frameworkInfo.set_role("foo");
+
     EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo));
   }
 
@@ -2401,6 +2405,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles)
     FrameworkInfo frameworkInfo;
     frameworkInfo.add_capabilities()->set_type(
         FrameworkInfo::Capability::MULTI_ROLE);
+
     EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo));
   }
 
@@ -2411,20 +2416,21 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles)
         FrameworkInfo::Capability::MULTI_ROLE);
     frameworkInfo.add_roles("bar");
     frameworkInfo.add_roles("qux");
+
     EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo));
   }
 
-  // Is MULTI_ROLE, has 'role', no 'roles'.
+  // Is MULTI_ROLE, has 'role' (error!), no 'roles'.
   {
     FrameworkInfo frameworkInfo;
     frameworkInfo.set_role("foo");
     frameworkInfo.add_capabilities()->set_type(
         FrameworkInfo::Capability::MULTI_ROLE);
-    // 'Role' is set, but MULTI_ROLE capability is also enabled.
+
     EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo));
   }
 
-  // Is MULTI_ROLE, has 'role', has 'roles'.
+  // Is MULTI_ROLE, has 'role' (error!), has 'roles'.
   {
     FrameworkInfo frameworkInfo;
     frameworkInfo.set_role("foo");
@@ -2432,7 +2438,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles)
         FrameworkInfo::Capability::MULTI_ROLE);
     frameworkInfo.add_roles("bar");
     frameworkInfo.add_roles("qux");
-    // All 'role', 'roles' and MULTI_ROLE are set.
+
     EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo));
   }
 
@@ -2444,6 +2450,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles)
     frameworkInfo.add_roles("bar");
     frameworkInfo.add_roles("qux");
     frameworkInfo.add_roles("bar");
+
     EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo));
   }
 
@@ -2454,6 +2461,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles)
     frameworkInfo.add_roles("/x");
     frameworkInfo.add_capabilities()->set_type(
         FrameworkInfo::Capability::MULTI_ROLE);
+
     EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo));
   }
 }