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 48EF628FED for ; Thu, 2 Aug 2018 09:07:44 -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 i3kYvx3VwQ4Z for ; Thu, 2 Aug 2018 09:07:44 -0400 (EDT) Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [94.100.177.107]) (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 0622526FE3 for ; Thu, 2 Aug 2018 09:07:43 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH] Fix net.box test References: From: Vladislav Shpilevoy Message-ID: <8f0facc1-964c-660d-4672-53a97c416cc0@tarantool.org> Date: Thu, 2 Aug 2018 16:07:40 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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, Georgy Kirichenko LGTM. On 02/08/2018 12:16, Georgy Kirichenko wrote: > There is a different error message while gitlab ci running > > Fixes #3602 > --- > Branch: https://github.com/tarantool/tarantool/tree/g.kirichenko/gh-3602-netbox-test > Issues: https://github.com/tarantool/tarantool/issues/3602 > test/box/net.box.result | 6 ++++-- > test/box/net.box.test.lua | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/test/box/net.box.result b/test/box/net.box.result > index 19afc91a3..37ac54658 100644 > --- a/test/box/net.box.result > +++ b/test/box/net.box.result > @@ -2285,7 +2285,8 @@ test_run:cmd("setopt delimiter ';'") > --- > - true > ... > -while test_run:grep_log('default', 'Connection refused', 1000) == nil and > +while test_run:grep_log('default', 'Network is unreachable', 1000) == nil and > + test_run:grep_log('default', 'Connection refused', 1000) == nil and > test_run:grep_log('default', 'Cannot assign requested address', 1000) == nil do > fiber.sleep(0.1) > end; > @@ -2294,7 +2295,8 @@ end; > log.info(string.rep('a', 1000)); > --- > ... > -while test_run:grep_log('default', 'Connection refused', 1000) == nil and > +while test_run:grep_log('default', 'Network is unreachable', 1000) == nil and > + test_run:grep_log('default', 'Connection refused', 1000) == nil and > test_run:grep_log('default', 'Cannot assign requested address', 1000) == nil do > fiber.sleep(0.1) > end; > diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua > index 51bc8c373..56b656cc5 100644 > --- a/test/box/net.box.test.lua > +++ b/test/box/net.box.test.lua > @@ -940,12 +940,14 @@ old_log_level = box.cfg.log_level > box.cfg{log_level = 6} > log.info(string.rep('a', 1000)) > test_run:cmd("setopt delimiter ';'") > -while test_run:grep_log('default', 'Connection refused', 1000) == nil and > +while test_run:grep_log('default', 'Network is unreachable', 1000) == nil and > + test_run:grep_log('default', 'Connection refused', 1000) == nil and > test_run:grep_log('default', 'Cannot assign requested address', 1000) == nil do > fiber.sleep(0.1) > end; > log.info(string.rep('a', 1000)); > -while test_run:grep_log('default', 'Connection refused', 1000) == nil and > +while test_run:grep_log('default', 'Network is unreachable', 1000) == nil and > + test_run:grep_log('default', 'Connection refused', 1000) == nil and > test_run:grep_log('default', 'Cannot assign requested address', 1000) == nil do > fiber.sleep(0.1) > end; >