From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id EB25B6EC60; Thu, 13 May 2021 23:23:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EB25B6EC60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1620937428; bh=GswPuRa0OzAgsH6kkAPgpLMVRfmTr7DG+A/8HhkE9Xs=; h=To:References:Date:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Mxa6uRo/+3VLyCWbMwOVovDyk4klIM5aZNXML0G+mPmyojwHKwGkVHuehjR54+OL/ rHV5z+KOOC/ovSfGYRBV1/TbR5n9iG6v1szNW0oq7t+NxF4IJhbafmt7urKt5aduay vw2o62df+Ei9rDCLJqOwApL4LNwSNSbTnScY6L4c= Received: from smtp17.mail.ru (smtp17.mail.ru [94.100.176.154]) (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 85E1D6EC60 for ; Thu, 13 May 2021 23:23:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 85E1D6EC60 Received: by smtp17.mail.ru with esmtpa (envelope-from ) id 1lhHrd-0004NZ-Ma; Thu, 13 May 2021 23:23:22 +0300 To: Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org, yaroslav.dynnikov@tarantool.org References: Message-ID: Date: Thu, 13 May 2021 23:23:20 +0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD95978C26455E69BE0B2C7F7C3B0039F139F0EF8E3717E163C182A05F538085040A5E69ED2ABE2F02641EB53C93C67D1EB0B5FD1C806798EA00045E2DCC44DB623 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77E216A0E97507353EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375448D590B04CE87D8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B25A1666030D2D0675708224A38D25568A42232221D1CC1427D2E47CDBA5A96583C09775C1D3CA48CF17B107DEF921CE79117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7328B01A8D746D8839FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE731128297CE6726AF7B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050FB28585415E75ADA90A5971FBB7557E96B3661434B16C20AC78D18283394535A9E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B8770A28E92C099B175ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D25379311020FFC8D4ADED1450B5CB7B5189B4B5D20ADF4CA90F X-C1DE0DAB: 0D63561A33F958A587F29F42181F19934F4FEE9794FFFB1F74CDCFEB1069DAAFD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AC632F0BE69382F39A0C21D8A657A4952B95A67C0B3131813EE7EC6ABEF06C489A09E7B589C3CC4F1D7E09C32AA3244C56C6BA44FB7D9FD423C0AC1D2EFE28D3E3D93501275E802FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojoybArHp+PQXF35MbuOFKZQ== X-Mailru-Sender: 9482C2B233321BD21A641ECFDAC686C885B45BC360C35E1F41EB53C93C67D1EB7345D355D45E21A67019711D9D5B048E1458020726E2BC9FD5ECBA0B92C0A936CDC7563AA7CEBD287402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH 1/2] test: fix test output on latest Tarantool X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Oleg Babin via Tarantool-patches Reply-To: Oleg Babin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for your patch. LGTM. On 13.05.2021 14:07, Vladislav Shpilevoy wrote: > Duplicate key error at insertion into a space on the latest > Tarantool changed its message and it broke of the tests. The patch > updates the test so it checks only the needed part of the message > and does not depend on Tarantool version anymore. > --- > test/storage/storage.result | 8 +++++--- > test/storage/storage.test.lua | 3 ++- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/test/storage/storage.result b/test/storage/storage.result > index 2c9784a..d18b7f8 100644 > --- a/test/storage/storage.result > +++ b/test/storage/storage.result > @@ -179,10 +179,12 @@ vshard.storage.buckets_info() > status: active > id: 1 > ... > -vshard.storage.bucket_force_create(1) -- error > +ok, err = vshard.storage.bucket_force_create(1) > --- > -- null > -- Duplicate key exists in unique index 'pk' in space '_bucket' > +... > +assert(not ok and err.message:match("Duplicate key exists")) > +--- > +- Duplicate key exists > ... > vshard.storage.bucket_force_drop(1) > --- > diff --git a/test/storage/storage.test.lua b/test/storage/storage.test.lua > index 33f0498..97558f6 100644 > --- a/test/storage/storage.test.lua > +++ b/test/storage/storage.test.lua > @@ -56,7 +56,8 @@ vshard.storage.sync(100500) > vshard.storage.buckets_info() > vshard.storage.bucket_force_create(1) > vshard.storage.buckets_info() > -vshard.storage.bucket_force_create(1) -- error > +ok, err = vshard.storage.bucket_force_create(1) > +assert(not ok and err.message:match("Duplicate key exists")) > vshard.storage.bucket_force_drop(1) > > vshard.storage.buckets_info()