You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2014/04/29 21:19:45 UTC

git commit: Removed ExternalContainerizer.Launch test for disabled Python builds.

Repository: mesos
Updated Branches:
  refs/heads/master a95dc6479 -> e30cba966


Removed ExternalContainerizer.Launch test for disabled Python builds.

Currently ExternalContainerizerTest.Launch relies upon a Python script
which in turn relies upon the Mesos Python egg being available. When
Python is disabled (--disable-python) during the configuration phase,
the Mesos Python egg is not being built, hence the Python script
(test_containerizer.py) can not use it and the test fails.

This patch excludes ExternalContainerizerTest.Launch from the test-suite
when Python has been disabled.

Review: https://reviews.apache.org/r/20823


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e30cba96
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e30cba96
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e30cba96

Branch: refs/heads/master
Commit: e30cba9668431b19c913090fcfef90268a8d4a85
Parents: a95dc64
Author: Till Toenshoff <to...@me.com>
Authored: Tue Apr 29 12:19:09 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Apr 29 12:19:09 2014 -0700

----------------------------------------------------------------------
 src/tests/external_containerizer_test.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/e30cba96/src/tests/external_containerizer_test.cpp
----------------------------------------------------------------------
diff --git a/src/tests/external_containerizer_test.cpp b/src/tests/external_containerizer_test.cpp
index 6f7b13e..64e8361 100644
--- a/src/tests/external_containerizer_test.cpp
+++ b/src/tests/external_containerizer_test.cpp
@@ -61,9 +61,14 @@ using testing::Return;
 using testing::SaveArg;
 using testing::Invoke;
 
+// The external containerizer tests currently rely on a Python script
+// which needs the Mesos Python egg being built.
+// TODO(tillt): Consider providing tests that do not rely on Python.
+#ifdef MESOS_HAS_PYTHON
+
 // TODO(tillt): Update and enhance the ExternalContainerizer tests,
 // possibly following some of the patterns used within the
-// IsolatorTests.
+// IsolatorTests or even entirely reusing the Containerizer tests.
 class ExternalContainerizerTest : public MesosTest {};
 
 
@@ -255,3 +260,5 @@ TEST_F(ExternalContainerizerTest, Launch)
 
   this->Shutdown();
 }
+
+#endif // MESOS_HAS_PYTHON