From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp33.i.mail.ru (smtp33.i.mail.ru [94.100.177.93]) (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 6A08B45C304 for ; Thu, 10 Dec 2020 18:38:57 +0300 (MSK) References: From: Oleg Koshovetc Message-ID: <0937af23-de9d-68b5-bcfb-0b24ae0a6a3b@tarantool.org> Date: Thu, 10 Dec 2020 18:38:11 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Tarantool-patches] [PATCH v1] test: add filter to box/net.*after_gh-3164 test List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" , Kirill Yukhin Cc: tarantool-patches@dev.tarantool.org LGTM NIT: Regular expressions could be a bit stricter, especially "port: .*" one. On 08.12.2020 19:19, Alexander V. Tikhonov via Tarantool-patches wrote: > Cc: tarantool-patches@dev.tarantool.org > > Found issue: > > [079] @@ -115,5 +115,14 @@ > [079] -- connection is deleted by 'collect'. > [079] weak.c > [079] --- > [079] -- null > [079] +- peer_uuid: 035d7b36-f205-45f4-9e16-e5b0b99a9b0b > [079] + opts: > [079] + reconnect_after: 0.1 > [079] + host: unix/ > [079] + schema_version: 78 > [079] + protocol: Binary > [079] + state: error_reconnect > [079] + error: Connection refused > [079] + peer_version_id: 132864 > [079] + port: /tmp/tnt/079_box/proxy.socket-iproto > [079] ... > > Which could not be restarted with checksum because of changing UUID > value each run. To avoid of it added filter on 'peer_uuid:' output. > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/box-test-filter > > .../net.box_reconnect_after_gh-3164.result | 20 +++++++++++++++++++ > .../net.box_reconnect_after_gh-3164.test.lua | 6 ++++++ > test/box/suite.ini | 3 ++- > 3 files changed, 28 insertions(+), 1 deletion(-) > > diff --git a/test/box/net.box_reconnect_after_gh-3164.result b/test/box/net.box_reconnect_after_gh-3164.result > index 216ce0366..f28674bb6 100644 > --- a/test/box/net.box_reconnect_after_gh-3164.result > +++ b/test/box/net.box_reconnect_after_gh-3164.result > @@ -10,6 +10,26 @@ test_run = require('test_run').new() > net = require('net.box') > --- > ... > +test_run:cmd("push filter 'peer_uuid: .*' to 'peer_uuid: '") > +--- > +- true > +... > +test_run:cmd("push filter 'reconnect_after: .*' to 'reconnect_after: '") > +--- > +- true > +... > +test_run:cmd("push filter 'schema_version: .*' to 'schema_version: '") > +--- > +- true > +... > +test_run:cmd("push filter 'peer_version_id: .*' to 'peer_version_id: '") > +--- > +- true > +... > +test_run:cmd("push filter 'port: .*' to 'port: '") > +--- > +- true > +... > test_run:cmd('create server connecter with script = "box/proxy.lua"') > --- > - true > diff --git a/test/box/net.box_reconnect_after_gh-3164.test.lua b/test/box/net.box_reconnect_after_gh-3164.test.lua > index dc2747080..085ce018f 100644 > --- a/test/box/net.box_reconnect_after_gh-3164.test.lua > +++ b/test/box/net.box_reconnect_after_gh-3164.test.lua > @@ -3,6 +3,12 @@ log = require 'log' > test_run = require('test_run').new() > net = require('net.box') > > +test_run:cmd("push filter 'peer_uuid: .*' to 'peer_uuid: '") > +test_run:cmd("push filter 'reconnect_after: .*' to 'reconnect_after: '") > +test_run:cmd("push filter 'schema_version: .*' to 'schema_version: '") > +test_run:cmd("push filter 'peer_version_id: .*' to 'peer_version_id: '") > +test_run:cmd("push filter 'port: .*' to 'port: '") > + > test_run:cmd('create server connecter with script = "box/proxy.lua"') > > -- > diff --git a/test/box/suite.ini b/test/box/suite.ini > index 7d0f0365b..e700d0b9e 100644 > --- a/test/box/suite.ini > +++ b/test/box/suite.ini > @@ -56,7 +56,8 @@ fragile = { > "issues": [ "gh-4998" ] > }, > "net.box_reconnect_after_gh-3164.test.lua": { > - "issues": [ "gh-5081" ] > + "issues": [ "gh-5081" ], > + "checksums": [ "a9dd14d22308797aaaeded75bddaae2a" ] > }, > "net.box_disconnect_gh-3859.test.lua": { > "issues": [ "gh-5156" ],