This is an automated email from the ASF dual-hosted git repository. bbannier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 3e9e1fac9b503f966835d7df4bd08c20b7a2277c Author: Benjamin Bannier <[email protected]> AuthorDate: Thu Dec 20 10:24:16 2018 +0100 Used high-level `FrameworkInfo` validation function in tests. This patch replaces uses of `framework::validateRoles` with the more high-level `framework::validate`. Since e.g., the master invokes `validate` instead of directly invoking `validateRoles` this ensures that our tests more closely match master behavior, and helps preventing that we test code which is not invoked in reality. Review: https://reviews.apache.org/r/69397/ --- src/tests/master_validation_tests.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp index 3aa7b2a..61c3d2a 100644 --- a/src/tests/master_validation_tests.cpp +++ b/src/tests/master_validation_tests.cpp @@ -4581,7 +4581,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) { FrameworkInfo frameworkInfo; - EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_NONE(::framework::validate(frameworkInfo)); } // Not MULTI_ROLE, no 'role' (default to "*"), has 'roles' (error!). @@ -4590,7 +4590,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_roles("bar"); frameworkInfo.add_roles("qux"); - EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_SOME(::framework::validate(frameworkInfo)); } // Not MULTI_ROLE, has 'role', no 'roles'. @@ -4598,7 +4598,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) FrameworkInfo frameworkInfo; frameworkInfo.set_role("foo"); - EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_NONE(::framework::validate(frameworkInfo)); } // Not MULTI_ROLE, has 'role', has 'roles' (error!). @@ -4608,7 +4608,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_roles("qux"); frameworkInfo.set_role("foo"); - EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_SOME(::framework::validate(frameworkInfo)); } // Is MULTI_ROLE, no 'role', no 'roles'. @@ -4617,7 +4617,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_capabilities()->set_type( FrameworkInfo::Capability::MULTI_ROLE); - EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_NONE(::framework::validate(frameworkInfo)); } // Is MULTI_ROLE, no 'role', has 'roles'. @@ -4628,7 +4628,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_roles("bar"); frameworkInfo.add_roles("qux"); - EXPECT_NONE(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_NONE(::framework::validate(frameworkInfo)); } // Is MULTI_ROLE, has 'role' (error!), no 'roles'. @@ -4638,7 +4638,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_capabilities()->set_type( FrameworkInfo::Capability::MULTI_ROLE); - EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_SOME(::framework::validate(frameworkInfo)); } // Is MULTI_ROLE, has 'role' (error!), has 'roles'. @@ -4650,7 +4650,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_roles("bar"); frameworkInfo.add_roles("qux"); - EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_SOME(::framework::validate(frameworkInfo)); } // Duplicate items in 'roles'. @@ -4662,7 +4662,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_roles("qux"); frameworkInfo.add_roles("bar"); - EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_SOME(::framework::validate(frameworkInfo)); } // Check invalid character in 'roles'. @@ -4673,7 +4673,7 @@ TEST_F(FrameworkInfoValidationTest, ValidateRoles) frameworkInfo.add_capabilities()->set_type( FrameworkInfo::Capability::MULTI_ROLE); - EXPECT_SOME(::framework::internal::validateRoles(frameworkInfo)); + EXPECT_SOME(::framework::validate(frameworkInfo)); } }
