ipython/ipython — pull request #4773 by takluyver (2014-01-08 22:15:04+00:00)
Title: Don't wait forever for notebook server to launch/die for tests

Should turn occasional test hangs (e.g. https://s3.amazonaws.com/archive.travis-ci.org/jobs/16615179/log.txt ) into straightforward errors.