Removed a duplicate unit test 'ROOT_INTERNET_CURL_Normalize'. Review: https://reviews.apache.org/r/58410/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f73f29bd Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f73f29bd Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f73f29bd Branch: refs/heads/master Commit: f73f29bd3f1399847309fa801f6c3c0a022d57fc Parents: d1015ff Author: Gilbert Song <[email protected]> Authored: Thu Apr 13 09:26:08 2017 -0700 Committer: Jie Yu <[email protected]> Committed: Thu Apr 13 09:26:08 2017 -0700 ---------------------------------------------------------------------- .../containerizer/provisioner_docker_tests.cpp | 75 -------------------- 1 file changed, 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f73f29bd/src/tests/containerizer/provisioner_docker_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp index 4dbd911..b0a4d21 100644 --- a/src/tests/containerizer/provisioner_docker_tests.cpp +++ b/src/tests/containerizer/provisioner_docker_tests.cpp @@ -540,81 +540,6 @@ TEST_P(ProvisionerDockerPullerTest, ROOT_INTERNET_CURL_SimpleCommand) } -// This test verifies the normalization of the Docker repository name. -// For official Docker images, users can omit the 'library/' prefix -// when specifying the repository name (e.g., 'busybox'). -TEST_F(ProvisionerDockerPullerTest, ROOT_INTERNET_CURL_Normalize) -{ - Try<Owned<cluster::Master>> master = StartMaster(); - ASSERT_SOME(master); - - slave::Flags flags = CreateSlaveFlags(); - flags.isolation = "docker/runtime,filesystem/linux"; - flags.image_providers = "docker"; - - Owned<MasterDetector> detector = master.get()->createDetector(); - Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags); - ASSERT_SOME(slave); - - MockScheduler sched; - MesosSchedulerDriver driver( - &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); - - EXPECT_CALL(sched, registered(&driver, _, _)); - - Future<vector<Offer>> offers; - EXPECT_CALL(sched, resourceOffers(&driver, _)) - .WillOnce(FutureArg<1>(&offers)) - .WillRepeatedly(Return()); // Ignore subsequent offers. - - driver.start(); - - AWAIT_READY(offers); - ASSERT_EQ(1u, offers->size()); - - const Offer& offer = offers.get()[0]; - - CommandInfo command; - command.set_shell(false); - command.set_value("/bin/ls"); - command.add_arguments("ls"); - command.add_arguments("-al"); - command.add_arguments("/"); - - TaskInfo task = createTask( - offer.slave_id(), - Resources::parse("cpus:1;mem:128").get(), - command); - - Image image; - image.set_type(Image::DOCKER); - image.mutable_docker()->set_name("alpine"); - - ContainerInfo* container = task.mutable_container(); - container->set_type(ContainerInfo::MESOS); - container->mutable_mesos()->mutable_image()->CopyFrom(image); - - Future<TaskStatus> statusRunning; - Future<TaskStatus> statusFinished; - EXPECT_CALL(sched, statusUpdate(&driver, _)) - .WillOnce(FutureArg<1>(&statusRunning)) - .WillOnce(FutureArg<1>(&statusFinished)); - - driver.launchTasks(offer.id(), {task}); - - AWAIT_READY_FOR(statusRunning, Seconds(60)); - EXPECT_EQ(task.task_id(), statusRunning->task_id()); - EXPECT_EQ(TASK_RUNNING, statusRunning->state()); - - AWAIT_READY(statusFinished); - EXPECT_EQ(task.task_id(), statusFinished->task_id()); - EXPECT_EQ(TASK_FINISHED, statusFinished->state()); - - driver.stop(); - driver.join(); -} - - // This test verifies that the scratch based docker image (that // only contain a single binary and its dependencies) can be // launched correctly.
