summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2017-10-21 20:47:37 +0200
committerStefan Behnel <stefan_ml@behnel.de>2017-10-22 12:41:03 +0200
commitbbc19c15e40b791c71746d20ebd87af83657c181 (patch)
tree4408ff9ed1619b8b5b3862ee6931e889c54a1322
parenta461b52aa929ede8120306d2851c737f7291ef19 (diff)
downloadcython-bbc19c15e40b791c71746d20ebd87af83657c181.tar.gz
Hard switch off IPython test if import fails. Could not find a better way to keep it from failing on appveyor.
-rw-r--r--Cython/Build/Tests/TestIpythonMagic.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/Cython/Build/Tests/TestIpythonMagic.py b/Cython/Build/Tests/TestIpythonMagic.py
index 34272e4df..fc8a84af7 100644
--- a/Cython/Build/Tests/TestIpythonMagic.py
+++ b/Cython/Build/Tests/TestIpythonMagic.py
@@ -20,9 +20,14 @@ except ImportError:
def str_to_unicode(self, s):
return s
- __test__ = {}
py3compat = _py3compat()
+ def skip_if_not_installed(_):
+ return None
+else:
+ def skip_if_not_installed(c):
+ return c
+
try:
# disable IPython history thread before it gets started to avoid having to clean it up
from IPython.core.history import HistoryManager
@@ -69,6 +74,7 @@ else:
return _skip_win32
+@skip_if_not_installed
class TestIPythonMagic(CythonTest):
@classmethod