You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2016/12/13 13:54:30 UTC
mesos git commit: Fixed tests by turning off agent subsystems in
IOSwitchboard tests.
Repository: mesos
Updated Branches:
refs/heads/master b6c18c1bd -> a0e30a047
Fixed tests by turning off agent subsystems in IOSwitchboard tests.
This fixes the changes introduced in
354bca1311c5b3b98a2a50689f0fba6a033e743d to enable building on OS X.
Review: https://reviews.apache.org/r/54702/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a0e30a04
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a0e30a04
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a0e30a04
Branch: refs/heads/master
Commit: a0e30a047b05c85f63ddbf4cf384742c199db435
Parents: b6c18c1
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Dec 13 14:53:28 2016 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Dec 13 14:53:28 2016 +0100
----------------------------------------------------------------------
src/tests/containerizer/io_switchboard_tests.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a0e30a04/src/tests/containerizer/io_switchboard_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/io_switchboard_tests.cpp b/src/tests/containerizer/io_switchboard_tests.cpp
index 5b7a668..5bd9dc4 100644
--- a/src/tests/containerizer/io_switchboard_tests.cpp
+++ b/src/tests/containerizer/io_switchboard_tests.cpp
@@ -468,7 +468,9 @@ TEST_F(IOSwitchboardTest, ContainerAttach)
slave::Flags flags = CreateSlaveFlags();
flags.launcher = "posix";
flags.isolation = "posix/cpu";
+#ifdef __linux__
flags.agent_subsystems = None();
+#endif
Fetcher fetcher;
@@ -535,7 +537,9 @@ TEST_F(IOSwitchboardTest, OutputRedirectionWithTTY)
slave::Flags flags = CreateSlaveFlags();
flags.launcher = "posix";
flags.isolation = "posix/cpu";
+#ifdef __linux__
flags.agent_subsystems = None();
+#endif
Fetcher fetcher;
@@ -601,7 +605,9 @@ TEST_F(IOSwitchboardTest, KillSwitchboardContainerDestroyed)
slave::Flags flags = CreateSlaveFlags();
flags.launcher = "posix";
flags.isolation = "posix/cpu";
+#ifdef __linux__
flags.agent_subsystems = None();
+#endif
Fetcher fetcher;
@@ -676,7 +682,9 @@ TEST_F(IOSwitchboardTest, RecoverThenKillSwitchboardContainerDestroyed)
slave::Flags flags = CreateSlaveFlags();
flags.launcher = "posix";
flags.isolation = "posix/cpu";
+#ifdef __linux__
flags.agent_subsystems = None();
+#endif
Fetcher fetcher;