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 85D9C27131 for ; Thu, 2 Aug 2018 05:16:07 -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 C0ECOEa7XUVu for ; Thu, 2 Aug 2018 05:16:07 -0400 (EDT) Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34]) (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 437CE270AD for ; Thu, 2 Aug 2018 05:16:07 -0400 (EDT) From: Georgy Kirichenko Subject: [tarantool-patches] [PATCH] Fix net.box test Date: Thu, 2 Aug 2018 12:16:02 +0300 Message-Id: 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 Cc: Georgy Kirichenko 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; -- 2.18.0