Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Check for tornado before running frontend.html tests. #748

Merged
merged 1 commit into from

4 participants

@ellisonbg
Owner

Please test to make sure this solves the issue.

@jdmarch
Collaborator

All tests now pass in OSX 10.6 and Ubuntu 10.4.
In Win7, the tornado failures are gone. There is still one (pre-existing, apparently unrelated) test failure which I will report separately.

@minrk
Owner

@ellisonbg - do you want to test for tornado 2.0, rather than just tornado? The server itself requires it, but I'm not sure if the tests would.

@ellisonbg
Owner
@takluyver
Owner

That solves the problem for me. I think you can merge this.

@ellisonbg ellisonbg merged commit 3651423 into from
@ellisonbg ellisonbg referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 30, 2011
  1. @ellisonbg
This page is out of date. Refresh to see the latest.
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]
Something went wrong with that request. Please try again.