Tarantool development patches archive
 help / color / mirror / Atom feed
From: Ilya Markov <imarkov@tarantool.org>
To: georgy@tarantool.org
Cc: tarantool-patches@freelists.org
Subject: [tarantool-patches] [socket 1/1] socket: Fix socket test
Date: Tue,  8 May 2018 14:03:24 +0300	[thread overview]
Message-ID: <2b973c0584473750948f7e3b7e629d910faa1f57.1525777323.git.imarkov@tarantool.org> (raw)

In sequential launch of app-tap/console.test, tests failed with "User
exists" and binding errors.

Make sockets path relative.
Add users cleanup.

Relates #3168
---
branch: gh-3168-fix-console-test
 test/app-tap/console.test.lua | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/app-tap/console.test.lua b/test/app-tap/console.test.lua
index 48d28bd..fecfa52 100755
--- a/test/app-tap/console.test.lua
+++ b/test/app-tap/console.test.lua
@@ -7,12 +7,12 @@ local yaml = require('yaml')
 local fiber = require('fiber')
 local ffi = require('ffi')
 local log = require('log')
+local fio = require('fio')
 
--- Supress console log messages
+-- Suppress console log messages
 log.level(4)
-
-local CONSOLE_SOCKET = '/tmp/tarantool-test-console.sock'
-local IPROTO_SOCKET = '/tmp/tarantool-test-iproto.sock'
+local CONSOLE_SOCKET = fio.pathjoin(fio.cwd(), 'tarantool-test-console.sock')
+local IPROTO_SOCKET = fio.pathjoin(fio.cwd(), 'tarantool-test-iproto.sock')
 os.remove(CONSOLE_SOCKET)
 os.remove(IPROTO_SOCKET)
 
@@ -64,7 +64,6 @@ box.cfg{
     memtx_memory = 107374182,
     log="tarantool.log",
 }
-
 -- Connect to iproto console (CALL)
 client:write(string.format("require('console').connect('/')\n"))
 -- error: Connection is not established
@@ -242,8 +241,12 @@ server:close()
 box.session.on_connect(nil, console_on_connect)
 box.session.on_disconnect(nil, console_on_disconnect)
 box.session.on_auth(nil, console_on_auth)
+box.schema.user.drop('test')
+box.schema.user.drop('test2')
 session_id = nil
 triggers_ran = nil
+os.remove(CONSOLE_SOCKET)
+os.remove(IPROTO_SOCKET)
 
 test:check()
 
-- 
2.7.4

             reply	other threads:[~2018-05-08 11:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08 11:03 Ilya Markov [this message]
2018-05-08 11:20 ` [tarantool-patches] " Konstantin Osipov

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=2b973c0584473750948f7e3b7e629d910faa1f57.1525777323.git.imarkov@tarantool.org \
    --to=imarkov@tarantool.org \
    --cc=georgy@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [socket 1/1] socket: Fix socket test' \
    /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