[tarantool-patches] [PATCH-v3 15/15] Fix flaky test

[tarantool-patches] [PATCH-v3 15/15] Fix flaky test

[Georgy Kirichenko]

---
 test/replication/sync.result   | 7 +++++--
 test/replication/sync.test.lua | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/replication/sync.result b/test/replication/sync.result
index eddc7cbc8..6b5a14d3f 100644
--- a/test/replication/sync.result
+++ b/test/replication/sync.result
@@ -46,7 +46,7 @@ function fill()
         box.space.test:replace{i}
     end
     fiber.create(function()
-        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.1)
+        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.0025)
         test_run:wait_cond(function()
             local r = box.info.replication[2]
             return r ~= nil and r.downstream ~= nil and
@@ -55,7 +55,6 @@ function fill()
         for i = count + 101, count + 200 do
             box.space.test:replace{i}
         end
-        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
     end)
     count = count + 200
 end;
@@ -250,6 +249,10 @@ test_run:cmd("switch default")
 ---
 - true
 ...
+box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
+---
+- ok
+...
 box.error.injection.set('ERRINJ_WAL_DELAY', true)
 ---
 - ok
diff --git a/test/replication/sync.test.lua b/test/replication/sync.test.lua
index 52ce88fe2..f0f530ad4 100644
--- a/test/replication/sync.test.lua
+++ b/test/replication/sync.test.lua
@@ -30,7 +30,7 @@ function fill()
         box.space.test:replace{i}
     end
     fiber.create(function()
-        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.1)
+        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.0025)
         test_run:wait_cond(function()
             local r = box.info.replication[2]
             return r ~= nil and r.downstream ~= nil and
@@ -39,7 +39,6 @@ function fill()
         for i = count + 101, count + 200 do
             box.space.test:replace{i}
         end
-        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
     end)
     count = count + 200
 end;
@@ -136,6 +135,7 @@ box.cfg{replication_sync_lag = 1}
 box.cfg{replication_sync_timeout = 10}
 
 test_run:cmd("switch default")
+box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
 box.error.injection.set('ERRINJ_WAL_DELAY', true)
 test_run:cmd("setopt delimiter ';'")
 _ = fiber.create(function()
-- 
2.21.0

[tarantool-patches] Re: [PATCH-v3 15/15] Fix flaky test

[Георгий Кириченко]

[-- Attachment #1: Type: text/plain, Size: 2454 bytes --]

Please don't review - sent by mistake

On Sunday, June 9, 2019 11:44:44 PM MSK Georgy Kirichenko wrote:
> ---
>  test/replication/sync.result   | 7 +++++--
>  test/replication/sync.test.lua | 4 ++--
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/test/replication/sync.result b/test/replication/sync.result
> index eddc7cbc8..6b5a14d3f 100644
> --- a/test/replication/sync.result
> +++ b/test/replication/sync.result
> @@ -46,7 +46,7 @@ function fill()
>          box.space.test:replace{i}
>      end
>      fiber.create(function()
> -        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.1)
> +        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.0025)
>          test_run:wait_cond(function()
>              local r = box.info.replication[2]
>              return r ~= nil and r.downstream ~= nil and
> @@ -55,7 +55,6 @@ function fill()
>          for i = count + 101, count + 200 do
>              box.space.test:replace{i}
>          end
> -        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
>      end)
>      count = count + 200
>  end;
> @@ -250,6 +249,10 @@ test_run:cmd("switch default")
>  ---
>  - true
>  ...
> +box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
> +---
> +- ok
> +...
>  box.error.injection.set('ERRINJ_WAL_DELAY', true)
>  ---
>  - ok
> diff --git a/test/replication/sync.test.lua b/test/replication/sync.test.lua
> index 52ce88fe2..f0f530ad4 100644
> --- a/test/replication/sync.test.lua
> +++ b/test/replication/sync.test.lua
> @@ -30,7 +30,7 @@ function fill()
>          box.space.test:replace{i}
>      end
>      fiber.create(function()
> -        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.1)
> +        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.0025)
>          test_run:wait_cond(function()
>              local r = box.info.replication[2]
>              return r ~= nil and r.downstream ~= nil and
> @@ -39,7 +39,6 @@ function fill()
>          for i = count + 101, count + 200 do
>              box.space.test:replace{i}
>          end
> -        box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
>      end)
>      count = count + 200
>  end;
> @@ -136,6 +135,7 @@ box.cfg{replication_sync_lag = 1}
>  box.cfg{replication_sync_timeout = 10}
> 
>  test_run:cmd("switch default")
> +box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
>  box.error.injection.set('ERRINJ_WAL_DELAY', true)
>  test_run:cmd("setopt delimiter ';'")
>  _ = fiber.create(function()


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 484 bytes --]