Repository: mesos Updated Branches: refs/heads/1.5.x 3c9adcc01 -> b0a33cb78
Added missing changes for backporting `AgentResourceProviderApiTest`. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b0a33cb7 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b0a33cb7 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b0a33cb7 Branch: refs/heads/1.5.x Commit: b0a33cb782db57d054f68335c8126ecae078b238 Parents: 3c9adcc Author: Chun-Hung Hsiao <chhs...@mesosphere.io> Authored: Wed Mar 28 23:15:18 2018 -0700 Committer: Chun-Hung Hsiao <chhs...@mesosphere.io> Committed: Thu Mar 29 08:29:55 2018 -0700 ---------------------------------------------------------------------- ...agent_resource_provider_config_api_tests.cpp | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b0a33cb7/src/tests/agent_resource_provider_config_api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/agent_resource_provider_config_api_tests.cpp b/src/tests/agent_resource_provider_config_api_tests.cpp index ea4dcc2..a8bb009 100644 --- a/src/tests/agent_resource_provider_config_api_tests.cpp +++ b/src/tests/agent_resource_provider_config_api_tests.cpp @@ -318,6 +318,16 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_IdempotentAdd) // Disable HTTP authentication to simplify resource provider interactions. slaveFlags.authenticate_http_readwrite = false; + // Set the resource provider capability. + vector<SlaveInfo::Capability> capabilities = slave::AGENT_CAPABILITIES(); + SlaveInfo::Capability capability; + capability.set_type(SlaveInfo::Capability::RESOURCE_PROVIDER); + capabilities.push_back(capability); + + slaveFlags.agent_features = SlaveCapabilities(); + slaveFlags.agent_features->mutable_capabilities()->CopyFrom( + {capabilities.begin(), capabilities.end()}); + slaveFlags.resource_provider_config_dir = resourceProviderConfigDir; // Generate a pre-existing config. @@ -364,6 +374,7 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_IdempotentAdd) addResourceProviderConfig(slave.get()->pid, contentType, info)); Clock::settle(); + Clock::resume(); } @@ -567,6 +578,16 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_IdempotentUpdate) // Disable HTTP authentication to simplify resource provider interactions. slaveFlags.authenticate_http_readwrite = false; + // Set the resource provider capability. + vector<SlaveInfo::Capability> capabilities = slave::AGENT_CAPABILITIES(); + SlaveInfo::Capability capability; + capability.set_type(SlaveInfo::Capability::RESOURCE_PROVIDER); + capabilities.push_back(capability); + + slaveFlags.agent_features = SlaveCapabilities(); + slaveFlags.agent_features->mutable_capabilities()->CopyFrom( + {capabilities.begin(), capabilities.end()}); + slaveFlags.resource_provider_config_dir = resourceProviderConfigDir; // Generate a pre-existing config. @@ -613,6 +634,7 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_IdempotentUpdate) updateResourceProviderConfig(slave.get()->pid, contentType, info)); Clock::settle(); + Clock::resume(); }
