Tarantool development patches archive
 help / color / mirror / Atom feed
* [tarantool-patches] [PATCH] Fix net.box test
@ 2018-08-02  9:16 Georgy Kirichenko
  2018-08-02 13:07 ` [tarantool-patches] " Vladislav Shpilevoy
  2018-08-07 18:12 ` Kirill Yukhin
  0 siblings, 2 replies; 3+ messages in thread
From: Georgy Kirichenko @ 2018-08-02  9:16 UTC (permalink / raw)
  To: tarantool-patches; +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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [tarantool-patches] Re: [PATCH] Fix net.box test
  2018-08-02  9:16 [tarantool-patches] [PATCH] Fix net.box test Georgy Kirichenko
@ 2018-08-02 13:07 ` Vladislav Shpilevoy
  2018-08-07 18:12 ` Kirill Yukhin
  1 sibling, 0 replies; 3+ messages in thread
From: Vladislav Shpilevoy @ 2018-08-02 13:07 UTC (permalink / raw)
  To: tarantool-patches, 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;
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [tarantool-patches] Re: [PATCH] Fix net.box test
  2018-08-02  9:16 [tarantool-patches] [PATCH] Fix net.box test Georgy Kirichenko
  2018-08-02 13:07 ` [tarantool-patches] " Vladislav Shpilevoy
@ 2018-08-07 18:12 ` Kirill Yukhin
  1 sibling, 0 replies; 3+ messages in thread
From: Kirill Yukhin @ 2018-08-07 18:12 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Georgy Kirichenko

Hello,
On 02 авг 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
Checked into 2.0 branch.

--
Regards, Kirill Yukhin

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-07 18:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-02  9:16 [tarantool-patches] [PATCH] Fix net.box test Georgy Kirichenko
2018-08-02 13:07 ` [tarantool-patches] " Vladislav Shpilevoy
2018-08-07 18:12 ` Kirill Yukhin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox