[Tarantool-patches] [PATCH v1] test: fix flaky box/on_shutdown.test.lua on asan

[Alexander V. Tikhonov]

Found that box/on_shutdown.test.lua test fails on asan build with:

  2020-08-26 09:04:06.750 [42629] main/102/on_shutdown [string "_ = box.ctl.on_shutdown(function() log.warn("..."]:1 W> on_shutdown 5
  Starting instance proxy...
  Run console at unix/:/tnt/test/var/001_box/proxy.control
  Start failed: builtin/box/console.lua:865: failed to create server unix/:/tnt/test/var/001_box/proxy.control: Address already in use

It happened on ASAN build, because server stop routine

  test-run/lib/preprocessor.py:TestState.server_stop() ->
    test-run/lib/tarantool_server.py:TarantoolServer.stop()

needs some delay to free the proxy.control socket created by

  test-run/lib/preprocessor.py:TestState.server_start() ->
    tarantoolctl:process_local()

To fix the issue added fiber.sleep() to give the needed delay.

Closes #5260
Part of #4360
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-5260-on-shutdown-test
Issue: https://github.com/tarantool/tarantool/issues/5260
Issue: https://github.com/tarantool/tarantool/issues/4360

 test/box/on_shutdown.result   | 5 +++++
 test/box/on_shutdown.skipcond | 7 -------
 test/box/on_shutdown.test.lua | 3 +++
 3 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 test/box/on_shutdown.skipcond

diff --git a/test/box/on_shutdown.result b/test/box/on_shutdown.result
index ccbdf45cb..ea3f8ca4a 100644
--- a/test/box/on_shutdown.result
+++ b/test/box/on_shutdown.result
@@ -142,6 +142,11 @@ test_run:cmd("stop server test")
 ---
 - true
 ...
+-- On ASAN build server stop needs some delay to free the proxy.control
+-- socket created by tarantoolctl:process_local(), check gh-5260.
+fiber.sleep(0.1)
+---
+...
 test_run:cmd("start server test")
 ---
 - true
diff --git a/test/box/on_shutdown.skipcond b/test/box/on_shutdown.skipcond
deleted file mode 100644
index e46fd1088..000000000
--- a/test/box/on_shutdown.skipcond
+++ /dev/null
@@ -1,7 +0,0 @@
-import os
-
-# Disabled at ASAN build due to issue #4360.
-if os.getenv("ASAN") == 'ON':
-    self.skip = 1
-
-# vim: set ft=python:
diff --git a/test/box/on_shutdown.test.lua b/test/box/on_shutdown.test.lua
index 2a9143404..91ff36f55 100644
--- a/test/box/on_shutdown.test.lua
+++ b/test/box/on_shutdown.test.lua
@@ -58,6 +58,9 @@ fiber.sleep(0.1)
 -- The server should be already stopped by os.exit(),
 -- but start doesn't work without a prior call to stop.
 test_run:cmd("stop server test")
+-- On ASAN build server stop needs some delay to free the proxy.control
+-- socket created by tarantoolctl:process_local(), check gh-5260.
+fiber.sleep(0.1)
 test_run:cmd("start server test")
 test_run:wait_log('test', 'on_shutdown 5', nil, 30, {noreset=true})
 -- make sure we exited because of os.exit(), not a signal.
-- 
2.17.1