From 97236ecebab6ecf4a9270862a1beb176642f3502 2014-09-02 17:37:35
From: Paul Ivanov <pi@berkeley.edu>
Date: 2014-09-02 17:37:35
Subject: [PATCH] Merge pull request #6388 from minrk/requests-2.4

catch any exception while waiting for server to start
---

diff --git a/IPython/html/tests/launchnotebook.py b/IPython/html/tests/launchnotebook.py
index 42ae768..e49fe80 100644
--- a/IPython/html/tests/launchnotebook.py
+++ b/IPython/html/tests/launchnotebook.py
@@ -37,7 +37,7 @@ class NotebookTestBase(TestCase):
         for _ in range(int(MAX_WAITTIME/POLL_INTERVAL)):
             try:
                 requests.get(url)
-            except requests.exceptions.ConnectionError:
+            except Exception as e:
                 if cls.notebook.poll() is not None:
                     raise RuntimeError("The notebook server exited with status %s" \
                                         % cls.notebook.poll())