Fixed the broken build in the port mapping tests.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e9d30079 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e9d30079 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e9d30079 Branch: refs/heads/master Commit: e9d300790aeb166081161280f1b934a91d0ddd05 Parents: 4b12df2 Author: Jie Yu <[email protected]> Authored: Wed Sep 16 21:37:20 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Wed Sep 16 21:37:28 2015 -0700 ---------------------------------------------------------------------- src/tests/containerizer/port_mapping_tests.cpp | 36 ++++++++------------- 1 file changed, 13 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/e9d30079/src/tests/containerizer/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp index 65cf55f..fc6d474 100644 --- a/src/tests/containerizer/port_mapping_tests.cpp +++ b/src/tests/containerizer/port_mapping_tests.cpp @@ -341,7 +341,8 @@ protected: Subprocess::FD(STDERR_FILENO), launchFlags, None(), - None()); + None(), + CLONE_NEWNET | CLONE_NEWNS); return pid; } @@ -439,8 +440,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -599,8 +599,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -761,8 +760,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerUDP) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -878,8 +876,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerTCP) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -1003,8 +1000,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPExternal) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -1089,8 +1085,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPInternal) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -1178,8 +1173,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerARPExternal) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -1273,8 +1267,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_DNS) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -1364,8 +1357,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Set the executor's resources. @@ -1472,8 +1464,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Open an nc server on the host side. Note that 'invalidPort' is in @@ -1624,8 +1615,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics) Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator); - Try<Launcher*> launcher = - LinuxLauncher::create(flags, isolator.get()->namespaces().get()); + Try<Launcher*> launcher = LinuxLauncher::create(flags); CHECK_SOME(launcher); // Open an nc server on the host side. Note that 'invalidPort' is
