From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D90C84696C3 for ; Fri, 10 Apr 2020 17:18:49 +0300 (MSK) Date: Fri, 10 Apr 2020 17:18:47 +0300 From: Sergey Bronnikov Message-ID: <20200410141847.GA36000@pony.bronevichok.ru> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [Tarantool-patches] [PATCH v1] test: fix flaky sql/func-recreate List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: Oleg Piskunov , tarantool-patches@dev.tarantool.org LGTM On 10:11 Wed 08 Apr , Alexander V. Tikhonov wrote: > Found that time limit in function used for testing in sql/func-recreate > test not enough for some time. Fiber set next is too near the time > limit. Decided to increase the time limit of the function, anyway it > checks its value at the test. > > Close #4384 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4384-increase-waitfor-time > Issue: https://github.com/tarantool/tarantool/issues/4384 > > test/sql/func-recreate.result | 6 +++--- > test/sql/func-recreate.test.lua | 2 +- > test/sql/suite.ini | 1 - > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/test/sql/func-recreate.result b/test/sql/func-recreate.result > index 73fb03cc4..c28e2c071 100644 > --- a/test/sql/func-recreate.result > +++ b/test/sql/func-recreate.result > @@ -18,7 +18,7 @@ box.internal.sql_create_function('WAITFOR', 'INT', function (n) fiber.sleep(n) r > ch = fiber.channel(1) > --- > ... > -_ = fiber.create(function () ch:put(box.execute('select WAITFOR(0.2)')) end) > +_ = fiber.create(function () ch:put(box.execute('select WAITFOR(0.5)')) end) > --- > ... > fiber.sleep(0.1) > @@ -32,10 +32,10 @@ box.internal.sql_create_function('WAITFOR', 'INT', function (n) require('fiber') > ch:get() > --- > - metadata: > - - name: WAITFOR(0.2) > + - name: WAITFOR(0.5) > type: integer > rows: > - - [0.2] > + - [0.5] > ... > box.internal.sql_create_function('WAITFOR', 'INT', function (n) require('fiber').sleep(n) return n end) > --- > diff --git a/test/sql/func-recreate.test.lua b/test/sql/func-recreate.test.lua > index 753e9ca4d..fa480288f 100644 > --- a/test/sql/func-recreate.test.lua > +++ b/test/sql/func-recreate.test.lua > @@ -8,7 +8,7 @@ box.internal.sql_create_function('WAITFOR', 'INT', function (n) fiber.sleep(n) r > > ch = fiber.channel(1) > > -_ = fiber.create(function () ch:put(box.execute('select WAITFOR(0.2)')) end) > +_ = fiber.create(function () ch:put(box.execute('select WAITFOR(0.5)')) end) > fiber.sleep(0.1) > > box.internal.sql_create_function('WAITFOR', 'INT', function (n) require('fiber').sleep(n) return n end) > diff --git a/test/sql/suite.ini b/test/sql/suite.ini > index a8664c510..cc1d641a8 100644 > --- a/test/sql/suite.ini > +++ b/test/sql/suite.ini > @@ -11,4 +11,3 @@ release_disabled = errinj.test.lua view_delayed_wal.test.lua sql-debug.test.lua > disabled = sql-statN-index-drop.test.lua > pretest_clean = True > fragile = dll.test.lua ; gh-4427 > - func-recreate.test.lua ; gh-4384 > -- > 2.17.1 > -- sergeyb@