Aside: I think most uses of assertTrue would be better as plain assert statements. The error message "False is not True" is rarely informative. But that's a style change, and I'm happy just working that in when I change tests.

I think the changes make sense, but I'll let someone else have a glance at it. The tests are running now.

Test results for commit fdc22f7 merged into master
Platform: linux2

• python2.7: OK (libraries not available: oct2py rpy2)
• python3.1: OK (libraries not available: cython matplotlib numpy oct2py pymongo qt rpy2 wx wx.aui zmq)
• python3.2: OK (libraries not available: cython oct2py pymongo rpy2 wx wx.aui)

Not available for testing: python2.6

This one have a merge conflict...
(also I wouldn't touch deathrow as we are avoiding it in 2to3 refactor)

Okay, rebased and removed any modifications to quarantine / deathrow.

I think I got most of the deprecated methods in this pull request, but there might be a few missing still. In particular there are a bunch of calls to tt.assert_equals in IPython.core.tests.test_run that I left alone.

I may be missing something, but why did you leave them alone in test_run?

Well, I wasn't sure what tt was.

Update: I see now that tt.assert_equals is essentially the same as nt.assert_equals, so I've applied the same transformation:

• tt.assert_equals -> tt.assert_equal

There are only a few tt.assert_foo (test_run and test_magic), and tt.assert_foo is nt.assert_foo.

I would suggest changing those calls to use the real nt.assert_foo, and remove this whole block.

@minrk Thanks for doing the research. I've removed that block of code and replaced tt.assert_foos with nt.assert_foo.

(Note this now has a conflict, so it will need a quick rebase)

Rebased & force pushed.

To git@github.com:bfroehle/ipython.git
+ 4e6d0ee...07ea078 unittest_deprecation_warnings -> unittest_deprecation_warnings (forced update)

Test results for commit 07ea078 merged into master
Platform: linux2

• python2.7: OK (libraries not available: oct2py pymongo tornado wx wx.aui)
• python3.2: OK (libraries not available: oct2py pymongo wx wx.aui)

Not available for testing: python2.6

Test results for commit 07ea078 merged into master
Platform: darwin

• python2.6: OK (libraries not available: cython matplotlib oct2py pygments pymongo qt rpy2 tornado wx wx.aui)
• python2.7: OK (libraries not available: oct2py wx wx.aui)
• python3.2: OK (libraries not available: cython matplotlib oct2py pymongo qt rpy2 wx wx.aui)

Not available for testing: python3.1

I've done a quick scan through (as of 3ac8c33) to check that there's nothing odd lurking in that big diff. I see Min's tests include Python 2.6, so I'm happy for this to go in now.

+1 to merge, thanks!

Merged this one.