Fix test-run crash when default server is crashed

lib/admin_connection.py

@@ -80,6 +80,10 @@ def cmd(self, socket, cmd, silent):
         return res
 
 
+class BrokenConsoleHandshake(RuntimeError):
+    pass
+
+
 class AdminConnection(TarantoolConnection, ExecMixIn):
     def execute_no_reconnect(self, command, silent):
         if not command:
@@ -93,7 +97,7 @@ def connect(self):
         super(AdminConnection, self).connect()
         handshake = get_handshake(self.socket)
         if not re.search(r'^Tarantool.*console.*', str(handshake)):
-            raise RuntimeError('Broken tarantool console handshake')
+            raise BrokenConsoleHandshake('Broken tarantool console handshake')
 
 
 class AdminAsyncConnection(TarantoolAsyncConnection, ExecMixIn):

lib/tarantool_server.py

@@ -26,7 +26,7 @@
     # Python 3
     from io import StringIO
 
-from lib.admin_connection import AdminConnection, AdminAsyncConnection
+from lib.admin_connection import AdminConnection, AdminAsyncConnection, BrokenConsoleHandshake
 from lib.box_connection import BoxConnection
 from lib.colorer import color_stdout
 from lib.colorer import color_log
@@ -421,14 +421,17 @@ def execute(self, server):
 
 
 class TarantoolStartError(OSError):
-    def __init__(self, name=None, timeout=None):
+    def __init__(self, name=None, timeout=None, reason=None):
         self.name = name
         self.timeout = timeout
+        self.reason = reason
 
     def __str__(self):
         message = '[Instance "{}"] Failed to start'.format(self.name)
         if self.timeout:
-            return "\n{} within {} seconds\n".format(message, self.timeout)
+            message = "{} within {} seconds".format(message, self.timeout)
+        if self.reason:
+            message = "{}: {}".format(message, self.reason)
         return "\n{}\n".format(message)
 
 
@@ -957,7 +960,7 @@ def crash_detect(self):
             if self.process.returncode is None:
                 gevent.sleep(0.1)
 
-        if self.process.returncode in [0, -signal.SIGKILL, -signal.SIGTERM]:
+        if self.process.returncode in [0, -signal.SIGABRT, -signal.SIGKILL, -signal.SIGTERM]:
             return
 
         self.kill_current_test()
@@ -1168,6 +1171,8 @@ def wait_until_started(self, wait_load=True, deadline=None):
                     gevent.sleep(0.1)
                     continue
                 raise
+            except BrokenConsoleHandshake as e:
+                raise TarantoolStartError(self.name, reason=e)
         else:
             raise TarantoolStartError(
                 self.name, Options().args.server_start_timeout)

lib/worker.py

@@ -13,6 +13,7 @@
 from lib.colorer import color_log
 from lib.colorer import color_stdout
 from lib.tarantool_server import TarantoolServer
+from lib.tarantool_server import TarantoolStartError
 from lib.test import get_result
 from lib.test_suite import TestSuite
 from lib.utils import safe_makedirs
@@ -285,6 +286,9 @@ def __init__(self, suite, _id):
         except KeyboardInterrupt:
             self.report_keyboard_interrupt()
             self.stop_server(cleanup=False)
+        except TarantoolStartError as e:
+            color_stdout(e, schema='error')
+            self.stop_server(cleanup=False)
         except Exception as e:
             color_stdout('Worker "%s" cannot start tarantool server; '
                          'the tasks will be ignored...\n' % self.name,

listeners.py

@@ -57,9 +57,7 @@ def process_result(self, obj):
             self.stats[obj.short_status] += 1
 
             if obj.short_status == 'fail':
-                self.failed_tasks.append((obj.task_id,
-                                          obj.worker_name,
-                                          obj.show_reproduce_content))
+                self.failed_tasks.append((obj.task_id, obj.worker_name, False))
 
             self.duration_stats[obj.task_id] = obj.duration
             self.print_status_line()