Repository: mesos Updated Branches: refs/heads/master e4a68e182 -> d9b9bcfc1
Added `DEFAULT_CREDENTIAL_2` to the tests. Review: https://reviews.apache.org/r/41934/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b24318a3 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b24318a3 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b24318a3 Branch: refs/heads/master Commit: b24318a34f4e396f622bfa899ee3c8f4d450f1a9 Parents: e4a68e1 Author: Greg Mann <[email protected]> Authored: Tue Jan 5 17:14:48 2016 -0800 Committer: Jie Yu <[email protected]> Committed: Tue Jan 5 17:14:48 2016 -0800 ---------------------------------------------------------------------- src/tests/mesos.cpp | 5 +++++ src/tests/mesos.hpp | 7 +++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b24318a3/src/tests/mesos.cpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp index f4b0f82..082e57b 100644 --- a/src/tests/mesos.cpp +++ b/src/tests/mesos.cpp @@ -110,10 +110,15 @@ master::Flags MesosTest::CreateMasterFlags() // JSON default format for credentials. Credentials credentials; + Credential* credential = credentials.add_credentials(); credential->set_principal(DEFAULT_CREDENTIAL.principal()); credential->set_secret(DEFAULT_CREDENTIAL.secret()); + credential = credentials.add_credentials(); + credential->set_principal(DEFAULT_CREDENTIAL_2.principal()); + credential->set_secret(DEFAULT_CREDENTIAL_2.secret()); + CHECK_SOME(os::write(fd.get(), stringify(JSON::protobuf(credentials)))) << "Failed to write credentials to '" << path << "'"; CHECK_SOME(os::close(fd.get())); http://git-wip-us.apache.org/repos/asf/mesos/blob/b24318a3/src/tests/mesos.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp index a4811b0..49a4c48 100644 --- a/src/tests/mesos.hpp +++ b/src/tests/mesos.hpp @@ -375,6 +375,13 @@ protected: credential; }) +#define DEFAULT_CREDENTIAL_2 \ + ({ Credential credential; \ + credential.set_principal("test-principal-2"); \ + credential.set_secret("test-secret-2"); \ + credential; }) + + #define DEFAULT_V1_CREDENTIAL \ ({ v1::Credential credential; \ credential.set_principal("test-principal"); \
