From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Oleg Piskunov <o.piskunov@tarantool.org>,
Sergey Bronnikov <sergeyb@tarantool.org>,
Alexander Turenko <alexander.turenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2] test: set unix sockets for iproto at core = app
Date: Thu, 21 May 2020 10:45:23 +0300 [thread overview]
Message-ID: <7f8b7e281522a7d1f7a723f7756f0c4e3be86c51.1590046682.git.avtikhon@tarantool.org> (raw)
Set hard-coded unix sockets for iproto connections at core = app.
Added its option in *-tap/suites.ini files and fixed test for it.
Fix helped to handle the problem with 'Address already in use' error.
Check the previous commit that set the use of sockets:
60f84cbf ('test: use unix sockets for iproto connections')
Closes #4459
---
Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4008-unix_sockets_iproto_sql_tap
Issue: https://github.com/tarantool/tarantool/issues/4459
test/app-tap/suite.ini | 1 +
test/app-tap/tarantoolctl.test.lua | 7 ++-----
test/box-tap/suite.ini | 1 +
test/sql-tap/suite.ini | 1 +
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/app-tap/suite.ini b/test/app-tap/suite.ini
index 9629dfad5..daababef5 100644
--- a/test/app-tap/suite.ini
+++ b/test/app-tap/suite.ini
@@ -4,3 +4,4 @@ description = application server tests (TAP)
lua_libs = lua/require_mod.lua lua/serializer_test.lua
is_parallel = True
pretest_clean = True
+use_unix_sockets_iproto = True
diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua
index 4d7059559..dd90c8a25 100755
--- a/test/app-tap/tarantoolctl.test.lua
+++ b/test/app-tap/tarantoolctl.test.lua
@@ -465,12 +465,9 @@ else
local remote_path = create_script(dir, 'remote.lua', remote_code)
test_run:cmd(("create server remote with script='%s'"):format(remote_path))
test_run:cmd("start server remote")
- local port = tonumber(
- test_run:eval("remote",
- "return require('uri').parse(box.cfg.listen).service")[1]
- )
+ local admin_socket = test_run:eval("remote", "return box.cfg.listen")[1]
- local command_base = ('tarantoolctl play localhost:%d filler/00000000000000000000.xlog'):format(port)
+ local command_base = ('tarantoolctl play %s filler/00000000000000000000.xlog'):format(admin_socket)
local status, err = pcall(function()
test:test("fill and test play output", function(test_i)
diff --git a/test/box-tap/suite.ini b/test/box-tap/suite.ini
index 8d9e32d3f..3cdef2131 100644
--- a/test/box-tap/suite.ini
+++ b/test/box-tap/suite.ini
@@ -3,5 +3,6 @@ core = app
description = Database tests with #! using TAP
is_parallel = True
pretest_clean = True
+use_unix_sockets_iproto = True
fragile = cfg.test.lua ; gh-4344
key_def.test.lua ; gh-4252
diff --git a/test/sql-tap/suite.ini b/test/sql-tap/suite.ini
index 8f3c3eab1..0e8498875 100644
--- a/test/sql-tap/suite.ini
+++ b/test/sql-tap/suite.ini
@@ -29,5 +29,6 @@ long_run = gh-3332-tuple-format-leak.test.lua, gh-3083-ephemeral-unref-tuples.te
config = engine.cfg
show_reproduce_content = False
pretest_clean = True
+use_unix_sockets_iproto = True
fragile = gh-4077-iproto-execute-no-bind.test.lua ; gh-4459
selectG.test.lua ; gh-4458
--
2.17.1
next reply other threads:[~2020-05-21 7:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 7:45 Alexander V. Tikhonov [this message]
2020-05-21 11:29 ` Alexander Turenko
2020-05-21 11:38 ` Alexander V. Tikhonov
2020-05-22 12:50 ` Oleg Piskunov
2020-05-21 17:53 ` Alexander Turenko
2020-05-21 19:37 ` Alexander V. Tikhonov
2020-05-28 7:36 ` Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7f8b7e281522a7d1f7a723f7756f0c4e3be86c51.1590046682.git.avtikhon@tarantool.org \
--to=avtikhon@tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=o.piskunov@tarantool.org \
--cc=sergeyb@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2] test: set unix sockets for iproto at core = app' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox