From e7f91ea6d37339fa2bcd942499bdef9dd1093092 2014-06-04 20:19:52
From: Jonathan Frederic <jon.freder@gmail.com>
Date: 2014-06-04 20:19:52
Subject: [PATCH] Rebase fix(es)

---

diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index c5056b3..c9e486f 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -307,7 +307,7 @@ class JSController(TestController):
                     # get invalid JSON; it should be ready next iteration.
                     pass
                 else:
-                return
+                    return
             time.sleep(0.1)
         print("Notebook server-info file never arrived: %s" % self.server_info_file,
             file=sys.stderr