Skip to content
This repository

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

Merged
merged 1 commit into from over 2 years ago

4 participants

Brian E. Granger Jonathan March Min RK Thomas Kluyver
Brian E. Granger
Owner

Please test to make sure this solves the issue.

Jonathan March
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.

Min RK
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.

Brian E. Granger
Owner
Thomas Kluyver
Collaborator

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

Brian E. Granger ellisonbg merged commit 3651423 into from September 06, 2011
Brian E. Granger ellisonbg closed this September 06, 2011
Brian E. Granger ellisonbg referenced this pull request from a commit January 10, 2012
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

Showing 1 unique commit by 1 author.

Aug 30, 2011
Brian E. Granger Check for tornado before running frontend.html tests. 019c335
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 4 additions and 0 deletions. Show diff stats Hide diff stats

  1. 4  IPython/testing/iptest.py
4  IPython/testing/iptest.py
@@ -111,6 +111,7 @@ def test_for(mod, min_version=None):
111 111
 else:
112 112
     have['zmq'] = test_for('zmq', '2.1.4')
113 113
 have['qt'] = test_for('IPython.external.qt')
  114
+have['tornado'] = test_for('tornado')
114 115
 
115 116
 #-----------------------------------------------------------------------------
116 117
 # Functions and classes
@@ -205,6 +206,9 @@ def make_exclude():
205 206
         exclusions.extend([ipjoin('lib', 'pylabtools'),
206 207
                            ipjoin('lib', 'tests', 'test_pylabtools')])
207 208
 
  209
+    if not have['tornado']:
  210
+        exclusions.append(ipjoin('frontend', 'html'))
  211
+
208 212
     # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
209 213
     if sys.platform == 'win32':
210 214
         exclusions = [s.replace('\\','\\\\') for s in exclusions]
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.