Tarantool development patches archive
 help / color / mirror / Atom feed
* [tarantool-patches] [PATCH] test: fix test for optional SQL_BIND in iproto
@ 2019-03-28  3:33 Alexander Turenko
  2019-03-28  3:38 ` [tarantool-patches] " Alexander Turenko
  0 siblings, 1 reply; 2+ messages in thread
From: Alexander Turenko @ 2019-03-28  3:33 UTC (permalink / raw)
  To: tarantool-patches; +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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [tarantool-patches] Re: [PATCH] test: fix test for optional SQL_BIND in iproto
  2019-03-28  3:33 [tarantool-patches] [PATCH] test: fix test for optional SQL_BIND in iproto Alexander Turenko
@ 2019-03-28  3:38 ` Alexander Turenko
  0 siblings, 0 replies; 2+ messages in thread
From: Alexander Turenko @ 2019-03-28  3:38 UTC (permalink / raw)
  To: tarantool-patches

Pushed to master and 2.1 as obvious.

To github.com:tarantool/tarantool.git
 - [deleted]             Totktonada/gh-4077-iproto-execute-no-bind-follow-up

WBR, Alexander Turenko.

On Thu, Mar 28, 2019 at 06:33:32AM +0300, Alexander Turenko wrote:
> 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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-03-28  3:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-28  3:33 [tarantool-patches] [PATCH] test: fix test for optional SQL_BIND in iproto Alexander Turenko
2019-03-28  3:38 ` [tarantool-patches] " Alexander Turenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox