mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #748 from ellisonbg/tornado-iptest

Browse Source 
Check for tornado before running frontend.html tests.
This commit is contained in:
Brian E. Granger 2011-09-06 14:10:58 -07:00
commit 1ae92b2d88
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IPython/testing/iptest.py
View File

@ -111,6 +111,7 @@ if os.name == 'nt':
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]