Accept table as new_box_uri

Prior to this patch, box.cfg.listen was only set to string or number,
although table is also supported by require('uri').parse(). Because of
this, it was not possible to use the table as net_box_uri when creating
the server. This patch allows the table to be used as net_box_uri. Note,
that for backward compatiblity net_box_uri given as table is converted
to string before setting as box.cfg.listen. This is done because most of
server implementations support box.cfg.listen as string.

Closes #342

Author: ImeevMA

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
   * Fixed incorrent unix socket path length check (gh-341).
+  * Now net_box_uri can be accepted as table (gh-342).
 
 ## 1.0.0
 

luatest/server.lua

@@ -41,7 +41,7 @@ local Server = {
 
         http_port = '?number',
         net_box_port = '?number',
-        net_box_uri = '?string',
+        net_box_uri = '?string|table',
         net_box_credentials = '?table',
 
         alias = '?string',
@@ -167,6 +167,9 @@ function Server:initialize()
                 :format(max_unix_socket_path[system]))
         end
     end
+    if type(self.net_box_uri) == 'table' then
+        self.net_box_uri = uri.format(parsed_net_box_uri, true)
+    end
 
     self.env = utils.merge(self.env or {}, self:build_env())
     self.args = self.args or {}
@@ -358,7 +361,7 @@ function Server:restart(params, opts)
 
         http_port = '?number',
         net_box_port = '?number',
-        net_box_uri = '?string',
+        net_box_uri = '?string|table',
         net_box_credentials = '?table',
 
         alias = '?string',

test/server_test.lua

@@ -1,5 +1,6 @@
 local fio = require('fio')
 local json = require('json')
+local urilib = require('uri')
 
 local t = require('luatest')
 local g = t.group()
@@ -321,6 +322,54 @@ g.test_unix_socket_not_include_uri_fields = function()
     s:stop()
 end
 
+g.test_table_uri_success = function()
+    t.skip_if(not utils.version_current_ge_than(2, 10, 0),
+              "URI as a table is supported since Tarantool 2.10.0.")
+    local workdir = fio.pathjoin(datadir, 'unix_socket')
+    fio.mktree(workdir)
+    local net_box_uri = {
+        uri = 'unix/:' .. fio.pathjoin(workdir, '/test_socket.sock'),
+        params = {
+            transport = 'plain'
+        },
+    }
+    local res = urilib.format(urilib.parse(net_box_uri))
+    local s = Server:new({
+        command = command,
+        workdir = workdir,
+        net_box_uri = net_box_uri,
+        http_port = 0, -- unused
+    })
+    s:start()
+    t.helpers.retrying({}, function() s:connect_net_box() end)
+    t.assert_equals(s:exec(function() return box.cfg.listen end), res)
+    s:stop()
+end
+
+g.test_table_uri_error = function()
+    t.skip_if(utils.version_current_ge_than(2, 10, 0),
+              "URI as a table is supported since Tarantool 2.10.0.")
+    local workdir = fio.pathjoin(datadir, 'unix_socket')
+    fio.mktree(workdir)
+    local net_box_uri = {
+        login = 'guest',
+        uri = 'unix/:' .. fio.pathjoin(workdir, '/test_socket.sock'),
+        params = {
+            transport = 'plain'
+        },
+    }
+    local err = [[bad argument #2 to 'uri_parse' (cannot convert 'table' ]] ..
+                [[to 'const char *')]]
+    t.assert_error_msg_contains(
+        err, Server.new, Server, {
+            command = command,
+            workdir = workdir,
+            net_box_uri = net_box_uri,
+            http_port = 0, -- unused
+        }
+    )
+end
+
 g.test_server_start_with_coverage_enabled = function()
     t.skip_if(server.coverage_report, 'Coverage is already enabled. Nothing to test')
     server:restart({coverage_report = true})