Reduce test execution time

spyder_terminal/server/static/js/main.js

@@ -144,7 +144,7 @@ function scrollTerm(delta) {
 }
 
 function isAlive() {
-   return alive
+   return alive;
 }
 
 function runRealTerminal() {

spyder_terminal/terminalplugin.py

@@ -56,6 +56,7 @@ class TerminalPlugin(SpyderPluginWidget):
     URL_ISSUES = ' https://github.com/spyder-ide/spyder-terminal/issues'
     CONF_SECTION = 'terminal'
     focus_changed = Signal()
+    server_is_ready = Signal()
     MAX_SERVER_CONTACT_RETRIES = 40
 
     def __init__(self, parent):
@@ -158,6 +159,7 @@ def __wait_server_to_start(self):
             self.server_retries += 1
             QTimer.singleShot(250, self.__wait_server_to_start)
         elif code == 200:
+            self.server_is_ready.emit()
             self.create_new_term(give_focus=False)
 
     # ------ SpyderPluginMixin API --------------------------------

spyder_terminal/tests/test_terminal.py

@@ -66,7 +66,9 @@ def setup_terminal(qtbot):
 def test_terminal_font(qtbot):
     """Test if terminal loads a custom font."""
     terminal = setup_terminal(qtbot)
-    qtbot.wait(TERM_UP)
+    blocker = qtbot.waitSignal(terminal.server_is_ready, timeout=TERM_UP)
+    blocker.wait()
+    qtbot.wait(2000)
 
     term = terminal.get_current_term()
     port = terminal.port
@@ -81,7 +83,9 @@ def test_terminal_font(qtbot):
 def test_terminal_tab_title(qtbot):
     """Test if terminal tab titles are numbered sequentially."""
     terminal = setup_terminal(qtbot)
-    qtbot.wait(TERM_UP)
+    blocker = qtbot.waitSignal(terminal.server_is_ready, timeout=TERM_UP)
+    blocker.wait()
+    qtbot.wait(2000)
     terminal.create_new_term()
     terminal.create_new_term()
     num_1 = int(terminal.tabwidget.tabText(1)[-1])
@@ -94,7 +98,9 @@ def test_new_terminal(qtbot):
     """Test if a new terminal is added."""
     # Setup widget
     terminal = setup_terminal(qtbot)
-    qtbot.wait(TERM_UP)
+    blocker = qtbot.waitSignal(terminal.server_is_ready, timeout=TERM_UP)
+    blocker.wait()
+    qtbot.wait(2000)
 
     # Test if server is running
     port = terminal.port
@@ -137,22 +143,21 @@ def test_output_redirection(qtbot):
 
 
 def test_close_terminal_manually(qtbot):
+    """Test if terminal tab is closed after process was finished manually."""
     # Setup widget
     terminal = setup_terminal(qtbot)
-    qtbot.wait(TERM_UP)
 
-    # Test if server is running
-    port = terminal.port
-    status_code = requests.get('http://127.0.0.1:{}'.format(port)).status_code
-    assert status_code == 200
+    blocker = qtbot.waitSignal(terminal.server_is_ready, timeout=TERM_UP)
+    blocker.wait()
+    qtbot.wait(2000)
 
     terminal.create_new_term()
-    initial_num = terminal.tabwidget.count()
+    initial_num = len(terminal.get_terms())
     term = terminal.get_current_term()
     qtbot.wait(1000)
 
     term.exec_cmd(EXIT)
-    qtbot.wait(5000)
+    qtbot.wait(1000)
 
-    final_num = terminal.tabwidget.count()
+    final_num = len(terminal.get_terms())
     assert final_num == initial_num - 1

spyder_terminal/widgets/terminalgui.py

@@ -25,7 +25,9 @@
 
 class TerminalWidget(QFrame):
     """Terminal widget."""
+
     terminal_closed = Signal()
+    terminal_ready = Signal()
 
     def __init__(self, parent, port, path='~', font=None):
         """Frame main constructor."""
@@ -44,7 +46,7 @@ def __init__(self, parent, port, path='~', font=None):
         self.body = self.view.document
 
         self.view.page().loadFinished.connect(self.setup_term)
-        QTimer.singleShot(250, self.is_alive)
+        QTimer.singleShot(250, self.__alive_loopback)
 
     @Slot(bool)
     def setup_term(self, finished):
@@ -76,13 +78,17 @@ def exec_cmd(self, cmd):
         """Execute a command inside the terminal."""
         self.eval_javascript('exec("{0}")'.format(cmd))
 
-    def is_alive(self):
-        """Check if terminal process is alive."""
-        alive = self.eval_javascript('isAlive()')
+    def __alive_loopback(self):
+        alive = self.is_alive()
         if not alive:
             self.terminal_closed.emit()
         else:
-            QTimer.singleShot(250, self.is_alive)
+            QTimer.singleShot(250, self.__alive_loopback)
+
+    def is_alive(self):
+        """Check if terminal process is alive."""
+        alive = self.eval_javascript('isAlive()')
+        return alive
 
 
 class TermView(WebView):