http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 451ad21..122f42d 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -982,7 +982,7 @@ TEST_F(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo) task.mutable_command()->MergeFrom(echoAuthorCommand()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerInfo* container = task.mutable_container(); container->set_type(ContainerInfo::MESOS); @@ -998,7 +998,7 @@ TEST_F(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo) ASSERT_SOME(sandbox); SlaveID slaveID; - slaveID.set_value(UUID::random().toString()); + slaveID.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launch = containerizer->launch( containerId, createContainerConfig(task, executor, sandbox.get(), "nobody"), @@ -2226,7 +2226,7 @@ TEST_F(SlaveTest, HTTPExecutorBadAuthentication) parentContainerId.set_value(principal->claims.at("cid")); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(parentContainerId); v1::agent::Call call; @@ -8752,7 +8752,7 @@ TEST_F(SlaveTest, ResourceProviderSubscribe) resourceProviderResources.mutable_provider_id()->CopyFrom(resourceProviderId); - const string resourceVersionUuid = UUID::random().toBytes(); + const string resourceVersionUuid = id::UUID::random().toBytes(); { mesos::v1::resource_provider::Call call; @@ -9273,7 +9273,7 @@ TEST_F(SlaveTest, ResourceProviderReconciliation) } // Update the resource version of the resource provider. - UUID resourceVersionUuid = UUID::random(); + id::UUID resourceVersionUuid = id::UUID::random(); v1::resource_provider::Call call; @@ -9451,7 +9451,7 @@ TEST_F(SlaveTest, RunTaskResourceVersions) v1::resource_provider::Call::UpdateState* updateState = call.mutable_update_state(); - updateState->set_resource_version_uuid(UUID::random().toBytes()); + updateState->set_resource_version_uuid(id::UUID::random().toBytes()); updateState->mutable_resources()->CopyFrom(resourceProviderResources_); AWAIT_READY(resourceProvider.send(call));
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_validation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_validation_tests.cpp b/src/tests/slave_validation_tests.cpp index d6e0931..d8bc142 100644 --- a/src/tests/slave_validation_tests.cpp +++ b/src/tests/slave_validation_tests.cpp @@ -285,7 +285,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainer) // Valid `container_id` but missing `container_id.parent`. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); launch->mutable_container_id()->CopyFrom(containerId); @@ -296,7 +296,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainer) // an invalid environment variable to check that the common validation // code for the command's environment is being executed. ContainerID parentContainerId; - parentContainerId.set_value(UUID::random().toString()); + parentContainerId.set_value(id::UUID::random().toString()); launch->mutable_container_id()->mutable_parent()->CopyFrom(parentContainerId); launch->mutable_command()->CopyFrom(createCommandInfo("exit 0")); @@ -323,7 +323,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainer) // Any number of parents is valid. ContainerID grandparentContainerId; - grandparentContainerId.set_value(UUID::random().toString()); + grandparentContainerId.set_value(id::UUID::random().toString()); launch->mutable_container_id()->mutable_parent()->mutable_parent() ->CopyFrom(grandparentContainerId); @@ -344,7 +344,7 @@ TEST(AgentCallValidationTest, WaitNestedContainer) // Expecting a `container_id.parent`. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); agent::Call::WaitNestedContainer* wait = call.mutable_wait_nested_container(); @@ -356,7 +356,7 @@ TEST(AgentCallValidationTest, WaitNestedContainer) // Test the valid case. ContainerID parentContainerId; - parentContainerId.set_value(UUID::random().toString()); + parentContainerId.set_value(id::UUID::random().toString()); wait->mutable_container_id()->mutable_parent()->CopyFrom(containerId); @@ -376,7 +376,7 @@ TEST(AgentCallValidationTest, KillNestedContainer) // Expecting a `container_id.parent`. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); agent::Call::KillNestedContainer* kill = call.mutable_kill_nested_container(); @@ -388,7 +388,7 @@ TEST(AgentCallValidationTest, KillNestedContainer) // Test the valid case. ContainerID parentContainerId; - parentContainerId.set_value(UUID::random().toString()); + parentContainerId.set_value(id::UUID::random().toString()); kill->mutable_container_id()->mutable_parent()->CopyFrom(containerId); @@ -408,7 +408,7 @@ TEST(AgentCallValidationTest, RemoveNestedContainer) // Expecting a `container_id.parent`. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); agent::Call::RemoveNestedContainer* removeNestedContainer = call.mutable_remove_nested_container(); @@ -420,7 +420,7 @@ TEST(AgentCallValidationTest, RemoveNestedContainer) // Test the valid case. ContainerID parentContainerId; - parentContainerId.set_value(UUID::random().toString()); + parentContainerId.set_value(id::UUID::random().toString()); removeNestedContainer->mutable_container_id()->mutable_parent()->CopyFrom( containerId); @@ -453,7 +453,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainerSession) // Valid `container_id` but missing `container_id.parent`. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); launch->mutable_container_id()->CopyFrom(containerId); @@ -464,7 +464,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainerSession) // an invalid environment variable to check that the common validation // code for the command's environment is being executed. ContainerID parentContainerId; - parentContainerId.set_value(UUID::random().toString()); + parentContainerId.set_value(id::UUID::random().toString()); launch->mutable_container_id()->mutable_parent()->CopyFrom(parentContainerId); launch->mutable_command()->CopyFrom(createCommandInfo("exit 0")); @@ -491,7 +491,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainerSession) // Any number of parents is valid. ContainerID grandparentContainerId; - grandparentContainerId.set_value(UUID::random().toString()); + grandparentContainerId.set_value(id::UUID::random().toString()); launch->mutable_container_id()->mutable_parent()->mutable_parent()->CopyFrom( grandparentContainerId); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/task_status_update_manager_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/task_status_update_manager_tests.cpp b/src/tests/task_status_update_manager_tests.cpp index d180e8c..0c8b058 100644 --- a/src/tests/task_status_update_manager_tests.cpp +++ b/src/tests/task_status_update_manager_tests.cpp @@ -442,7 +442,7 @@ TEST_F(TaskStatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck) update.slave_id(), frameworkId, update.status().task_id(), - UUID::random().toBytes()); + id::UUID::random().toBytes()); AWAIT_READY(unexpectedAck);
