You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/12/14 16:00:04 UTC
[1/2] mesos git commit: Temporarily disabled http authentication
tests while MESOS-4142 is fixed.
Repository: mesos
Updated Branches:
refs/heads/master 6eb2f98b3 -> dc6cde747
Temporarily disabled http authentication tests while MESOS-4142 is fixed.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1d4f50a2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1d4f50a2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1d4f50a2
Branch: refs/heads/master
Commit: 1d4f50a27b2c9626b19b79e7a23bfa41cc12b942
Parents: 6eb2f98
Author: Benjamin Mahler <be...@gmail.com>
Authored: Mon Dec 14 08:48:57 2015 -0600
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Mon Dec 14 08:48:57 2015 -0600
----------------------------------------------------------------------
3rdparty/libprocess/src/tests/http_tests.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1d4f50a2/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index 9fe2703..132e3c5 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -1204,7 +1204,8 @@ public:
};
-class HttpAuthenticationTest : public ::testing::Test
+// TODO(bmahler): These are disabled while MESOS-4142 is fixed.
+class DISABLED_HttpAuthenticationTest : public ::testing::Test
{
protected:
Future<Nothing> setAuthenticator(
@@ -1234,7 +1235,7 @@ private:
// Ensures that when there is no authenticator for a realm,
// requests are not authenticated (i.e. the principal is None).
-TEST_F(HttpAuthenticationTest, NoAuthenticator)
+TEST_F(DISABLED_HttpAuthenticationTest, NoAuthenticator)
{
Http http;
@@ -1249,7 +1250,7 @@ TEST_F(HttpAuthenticationTest, NoAuthenticator)
// Tests that an authentication Unauthorized result is exposed correctly.
-TEST_F(HttpAuthenticationTest, Unauthorized)
+TEST_F(DISABLED_HttpAuthenticationTest, Unauthorized)
{
MockAuthenticator* authenticator = new MockAuthenticator();
setAuthenticator("realm", Owned<Authenticator>(authenticator));
@@ -1277,7 +1278,7 @@ TEST_F(HttpAuthenticationTest, Unauthorized)
// Tests that an authentication Forbidden result is exposed correctly.
-TEST_F(HttpAuthenticationTest, Forbidden)
+TEST_F(DISABLED_HttpAuthenticationTest, Forbidden)
{
MockAuthenticator* authenticator = new MockAuthenticator();
setAuthenticator("realm", Owned<Authenticator>(authenticator));
@@ -1298,7 +1299,7 @@ TEST_F(HttpAuthenticationTest, Forbidden)
// Tests that a successful authentication hits the endpoint.
-TEST_F(HttpAuthenticationTest, Authenticated)
+TEST_F(DISABLED_HttpAuthenticationTest, Authenticated)
{
MockAuthenticator* authenticator = new MockAuthenticator();
setAuthenticator("realm", Owned<Authenticator>(authenticator));
@@ -1325,7 +1326,7 @@ TEST_F(HttpAuthenticationTest, Authenticated)
// Tests that HTTP pipelining is respected even when
// authentications are satisfied out-of-order.
-TEST_F(HttpAuthenticationTest, Pipelining)
+TEST_F(DISABLED_HttpAuthenticationTest, Pipelining)
{
MockAuthenticator* authenticator = new MockAuthenticator();
setAuthenticator("realm", Owned<Authenticator>(authenticator));
[2/2] mesos git commit: Fixed a bug in authentication endpoint
removal during Process cleanup.
Posted by bm...@apache.org.
Fixed a bug in authentication endpoint removal during Process cleanup.
When a process is destroyed, it unregisters all of its endpoints from
authentication. However the paths were malformed and the endpoints
were left inside the authentication router.
Review: https://reviews.apache.org/r/41326/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dc6cde74
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dc6cde74
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dc6cde74
Branch: refs/heads/master
Commit: dc6cde747eec94ba35aae5f5587d80338c000068
Parents: 1d4f50a
Author: Alexander Rojas <al...@mesosphere.io>
Authored: Mon Dec 14 08:50:32 2015 -0600
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Mon Dec 14 08:50:32 2015 -0600
----------------------------------------------------------------------
3rdparty/libprocess/src/process.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc6cde74/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index af3cefb..cff635e 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -2711,7 +2711,8 @@ void ProcessManager::cleanup(ProcessBase* process)
// Remove all routes from the authentication router, we don't
// need to wait for these operations to complete.
foreachkey (const string& endpoint, process->handlers.http) {
- authentication_router->removeEndpoint('/' + process->self().id + endpoint);
+ authentication_router->removeEndpoint(
+ '/' + process->self().id + '/' + endpoint);
}
// Possible gate non-libprocess threads are waiting at.