From 408fde5aa3be05504920770ec15a163f28da6099 Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Tue, 30 Aug 2011 09:39:57 -0700 Subject: [PATCH] Check for tornado before running frontend.html tests. --- IPython/testing/iptest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index cdbb7dcf7..3f9dbdee9 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -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]