Use only Unix sockets for admin console connection

This patch makes test-run use only Unix sockets for admin console
connection. The feature to use TCP sockets for it is dropped. Actually,
admin console connection is a purely internal thing of test-run, and we
can use what is more convenient for such a connection. Using only Unix
sockets gives us significant advantages over TCP sockets like connection
speed and eliminating issue with getting a free port for TCP connection.

Part of #141

Author: ylobankov

lib/preprocessor.py

@@ -259,7 +259,6 @@ def server_create(self, ctype, sname, opts):
         if 'rpl_master' in opts:
             temp.rpl_master = self.servers[opts['rpl_master']]
         temp.vardir = self.suite_ini['vardir']
-        temp.use_unix_sockets = self.suite_ini['use_unix_sockets']
         temp.use_unix_sockets_iproto = \
             self.suite_ini['use_unix_sockets_iproto']
         temp.inspector_port = int(self.suite_ini.get(

lib/tarantool_server.py

@@ -10,6 +10,7 @@
 import signal
 import subprocess
 import sys
+import textwrap
 import time
 import yaml
 
@@ -655,12 +656,15 @@ def __init__(self, _ini=None, test_suite=None):
             'lua_libs': [],
             'valgrind': False,
             'vardir': None,
-            'use_unix_sockets': False,
             'use_unix_sockets_iproto': False,
             'tarantool_port': None,
             'strace': False
         }
         ini.update(_ini)
+        if ini.get('use_unix_sockets') is not None:
+            qa_notice(textwrap.fill('The "use_unix_sockets" option is defined '
+                                    'in suite.ini, but it was dropped in favor '
+                                    'of permanent using Unix sockets'))
         Server.__init__(self, ini, test_suite)
         self.testdir = os.path.abspath(os.curdir)
         self.sourcedir = os.path.abspath(os.path.join(os.path.basename(
@@ -677,7 +681,6 @@ def __init__(self, _ini=None, test_suite=None):
         self.lua_libs = ini['lua_libs']
         self.valgrind = ini['valgrind']
         self.strace = ini['strace']
-        self.use_unix_sockets = ini['use_unix_sockets']
         self.use_unix_sockets_iproto = ini['use_unix_sockets_iproto']
         self._start_against_running = ini['tarantool_port']
         self.crash_detector = None
@@ -762,12 +765,9 @@ def install(self, silent=True):
             self.cleanup()
         self.copy_files()
 
-        if self.use_unix_sockets:
-            path = os.path.join(self.vardir, self.name + ".c")
-            warn_unix_socket(path)
-            self._admin = path
-        else:
-            self._admin = find_port()
+        path = os.path.join(self.vardir, self.name + ".c")
+        warn_unix_socket(path)
+        self._admin = path
 
         if self.use_unix_sockets_iproto:
             path = os.path.join(self.vardir, self.name + ".i")

lib/test_suite.py

@@ -140,7 +140,6 @@ def __init__(self, suite_path, args):
                 # use old format dictionary
                 self.fragile['tests'] = self.ini['fragile']
 
-        self.parse_bool_opt('use_unix_sockets', False)
         self.parse_bool_opt('use_unix_sockets_iproto', False)
         self.parse_bool_opt('is_parallel', False)
         self.parse_bool_opt('show_reproduce_content', True)

test/test-tarantool/suite.ini

@@ -2,5 +2,4 @@
 core = tarantool
 description = tarantool tests
 script = box.lua
-use_unix_sockets = True
 config = engine.cfg

test/unittest/suite.ini

@@ -2,5 +2,4 @@
 core = tarantool
 description = unit tests
 script = box-cc0544b6afd1.lua
-use_unix_sockets = True
 use_unix_sockets_iproto = True