From: Georgy Kirichenko <georgy@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Georgy Kirichenko <georgy@tarantool.org>
Subject: [tarantool-patches] [PATCH] Fix net.box test
Date: Thu, 2 Aug 2018 12:16:02 +0300 [thread overview]
Message-ID: <eb845c45cb59156b14e7a921e5e75c6c1c789a1e.1533201115.git.georgy@tarantool.org> (raw)
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
next reply other threads:[~2018-08-02 9:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 9:16 Georgy Kirichenko [this message]
2018-08-02 13:07 ` [tarantool-patches] " Vladislav Shpilevoy
2018-08-07 18:12 ` Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb845c45cb59156b14e7a921e5e75c6c1c789a1e.1533201115.git.georgy@tarantool.org \
--to=georgy@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='Re: [tarantool-patches] [PATCH] Fix net.box test' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox