You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/12/22 15:16:40 UTC
mesos git commit: Fixed API tests to pass with agent authentication
delay.
Repository: mesos
Updated Branches:
refs/heads/master 23f2e5e11 -> d35c7c553
Fixed API tests to pass with agent authentication delay.
This changes three tests to advance the clock after instantiating
an agent to allow the agent to authenticate and register.
A much more detailed analysis of this situation exists in MESOS-6803.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d35c7c55
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d35c7c55
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d35c7c55
Branch: refs/heads/master
Commit: d35c7c553ce8ea282ebf766c2a4d35e699d7e631
Parents: 23f2e5e
Author: Joseph Wu <jo...@apache.org>
Authored: Thu Dec 22 06:55:55 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Thu Dec 22 07:03:08 2016 -0800
----------------------------------------------------------------------
src/tests/api_tests.cpp | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d35c7c55/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 8a4c68f..e313869 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -3443,8 +3443,9 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunchFalse)
MockExecutor exec(DEFAULT_EXECUTOR_ID);
TestContainerizer containerizer(&exec);
+ slave::Flags agentFlags = CreateSlaveFlags();
Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), &containerizer);
+ StartSlave(detector.get(), &containerizer, agentFlags);
ASSERT_SOME(slave);
@@ -3469,6 +3470,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunchFalse)
driver.start();
+ // Trigger authentication and registration for the agent.
+ Clock::advance(agentFlags.authentication_backoff_factor);
+ Clock::advance(agentFlags.registration_backoff_factor);
+
AWAIT_READY(executorRegistered);
Future<hashset<ContainerID>> containerIds = containerizer.containers();
@@ -3566,8 +3571,9 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunch)
MockExecutor exec(DEFAULT_EXECUTOR_ID);
TestContainerizer containerizer(&exec);
+ slave::Flags agentFlags = CreateSlaveFlags();
Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), &containerizer);
+ StartSlave(detector.get(), &containerizer, agentFlags);
ASSERT_SOME(slave);
@@ -3592,6 +3598,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunch)
driver.start();
+ // Trigger authentication and registration for the agent.
+ Clock::advance(agentFlags.authentication_backoff_factor);
+ Clock::advance(agentFlags.registration_backoff_factor);
+
AWAIT_READY(executorRegistered);
Future<hashset<ContainerID>> containerIds = containerizer.containers();
@@ -3687,8 +3697,9 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
MockExecutor exec(DEFAULT_EXECUTOR_ID);
TestContainerizer containerizer(&exec);
+ slave::Flags agentFlags = CreateSlaveFlags();
Try<Owned<cluster::Slave>> slave =
- StartSlave(detector.get(), &containerizer);
+ StartSlave(detector.get(), &containerizer, agentFlags);
ASSERT_SOME(slave);
@@ -3711,6 +3722,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
driver.start();
+ // Trigger authentication and registration for the agent.
+ Clock::advance(agentFlags.authentication_backoff_factor);
+ Clock::advance(agentFlags.registration_backoff_factor);
+
AWAIT_READY(executorRegistered);
Future<hashset<ContainerID>> containerIds = containerizer.containers();