From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 89ECC2AE4B for ; Wed, 27 Mar 2019 23:33:46 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sshg3IqjNbeF for ; Wed, 27 Mar 2019 23:33:46 -0400 (EDT) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id C86DE21FD4 for ; Wed, 27 Mar 2019 23:33:45 -0400 (EDT) From: Alexander Turenko Subject: [tarantool-patches] [PATCH] test: fix test for optional SQL_BIND in iproto Date: Thu, 28 Mar 2019 06:33:32 +0300 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: Alexander Turenko Added necessary cleanup, because the test fails when both memtx and vinyl configurations are run on the same test-run worker. Aside of that disabled the test on vinyl, because it is engine-agnostic and only checks iproto. This is the fix for the commit 7676b2b1 ('sql: make SQL_BIND optional in an iproto request'). Follows up #4077. --- https://github.com/tarantool/tarantool/tree/Totktonada/gh-4077-iproto-execute-no-bind-follow-up https://github.com/tarantool/tarantool/issues/4077 test/sql-tap/engine.cfg | 1 + test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua | 3 +++ 2 files changed, 4 insertions(+) diff --git a/test/sql-tap/engine.cfg b/test/sql-tap/engine.cfg index 413dd3ff4..e98528e52 100644 --- a/test/sql-tap/engine.cfg +++ b/test/sql-tap/engine.cfg @@ -11,6 +11,7 @@ "sort.test.lua": { "memtx": {"engine": "memtx"} }, + "gh-4077-iproto-execute-no-bind.test.lua": {}, "*": { "memtx": {"engine": "memtx"}, "vinyl": {"engine": "vinyl"} diff --git a/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua b/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua index 55804768c..df548b8e6 100755 --- a/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua +++ b/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua @@ -66,4 +66,7 @@ local exp_res = {{1}} local res = box.space.T:pairs():map(box.tuple.totable):totable() test:is_deeply(res, exp_res, 'verify inserted data') +box.sql.execute('drop table T') +box.schema.user.revoke('guest', 'read,write,execute', 'universe') + os.exit(test:check() == true and 0 or 1) -- 2.20.1