From eb845c45cb59156b14e7a921e5e75c6c1c789a1e Mon Sep 17 00:00:00 2001
From: Georgy Kirichenko <georgy@tarantool.org>
Date: Thu, 19 Jul 2018 10:02:20 +0300
Subject: [PATCH] Fix net.box test
There is a different error message while gitlab ci running
Fixes #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 19afc91a37..37ac546583 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 51bc8c373f..56b656cc5a 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;
--
GitLab