Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #748 from ellisonbg/tornado-iptest

Check for tornado before running frontend.html tests.
  • Loading branch information...
commit 3651423d9a216cbbf88b18435179c85ac266bf4c 2 parents 7ff2814 + 019c335
@ellisonbg ellisonbg authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 IPython/testing/iptest.py
View
4 IPython/testing/iptest.py
@@ -111,6 +111,7 @@ def test_for(mod, min_version=None):
else:
have['zmq'] = test_for('zmq', '2.1.4')
have['qt'] = test_for('IPython.external.qt')
+have['tornado'] = test_for('tornado')
#-----------------------------------------------------------------------------
# Functions and classes
@@ -205,6 +206,9 @@ def make_exclude():
exclusions.extend([ipjoin('lib', 'pylabtools'),
ipjoin('lib', 'tests', 'test_pylabtools')])
+ if not have['tornado']:
+ exclusions.append(ipjoin('frontend', 'html'))
+
# This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
if sys.platform == 'win32':
exclusions = [s.replace('\\','\\\\') for s in exclusions]
Please sign in to comment.
Something went wrong with that request. Please try again.