From 7fa70b6619be693db3831411e306c6a62c35e655 Mon Sep 17 00:00:00 2001
From: Alexander Turenko <alexander.turenko@tarantool.org>
Date: Mon, 21 Jun 2021 22:09:50 +0300
Subject: [PATCH] test: update test-run (restart before each test)

This update offers two changes:

* More intelligent error reporting for non UTF-8 TAP13 output ([1],
  [2]).
* Restart tarantool server before each test (to avoid unexpected and
  non-obvious dependencies between tests, see [3]).

Removed the pretest_clean suite.ini option: test-run does not read it
anymore.

[1]: https://github.com/tarantool/test-run/issues/293
[2]: https://github.com/tarantool/test-run/pull/297
[3]: https://github.com/tarantool/test-run/pull/309
---
 test-run                   | 2 +-
 test/app-tap/suite.ini     | 1 -
 test/app/suite.ini         | 1 -
 test/box-tap/suite.ini     | 1 -
 test/box/suite.ini         | 1 -
 test/engine/suite.ini      | 1 -
 test/engine_long/suite.ini | 1 -
 test/replication/suite.ini | 1 -
 test/sql-tap/suite.ini     | 1 -
 test/sql/suite.ini         | 1 -
 test/vinyl/suite.ini       | 1 -
 test/wal_off/suite.ini     | 1 -
 test/xlog/suite.ini        | 1 -
 13 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/test-run b/test-run
index b15160f430..3aa4666c2b 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit b15160f430a51584c5ef943470a7d23e10354412
+Subproject commit 3aa4666c2b90abf3ca5e7215621fb1a2ce336bb6
diff --git a/test/app-tap/suite.ini b/test/app-tap/suite.ini
index f791ddc5e8..e8e38560cf 100644
--- a/test/app-tap/suite.ini
+++ b/test/app-tap/suite.ini
@@ -3,7 +3,6 @@ core = app
 description = application server tests (TAP)
 lua_libs = lua/require_mod.lua lua/serializer_test.lua lua/process_timeout.lua
 is_parallel = True
-pretest_clean = True
 use_unix_sockets_iproto = True
 release_disabled = gh-5040-inter-mode-isatty-via-errinj.test.lua
 fragile = {
diff --git a/test/app/suite.ini b/test/app/suite.ini
index fbe3842fdf..a7c69a4c5e 100644
--- a/test/app/suite.ini
+++ b/test/app/suite.ini
@@ -6,7 +6,6 @@ lua_libs = lua/fiber.lua
 use_unix_sockets = True
 use_unix_sockets_iproto = True
 is_parallel = True
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/box-tap/suite.ini b/test/box-tap/suite.ini
index 8ed7fffb96..d854fddbb6 100644
--- a/test/box-tap/suite.ini
+++ b/test/box-tap/suite.ini
@@ -2,7 +2,6 @@
 core = app
 description = Database tests with #! using TAP
 is_parallel = True
-pretest_clean = True
 use_unix_sockets_iproto = True
 release_disabled = errinj_set_with_enviroment_vars.test.lua
 config = suite.cfg
diff --git a/test/box/suite.ini b/test/box/suite.ini
index 4943974489..da316bce55 100644
--- a/test/box/suite.ini
+++ b/test/box/suite.ini
@@ -10,7 +10,6 @@ lua_libs = lua/fifo.lua lua/utils.lua lua/bitset.lua lua/index_random_test.lua l
 use_unix_sockets = True
 use_unix_sockets_iproto = True
 is_parallel = True
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/engine/suite.ini b/test/engine/suite.ini
index 0b230ec0ab..cf726f0711 100644
--- a/test/engine/suite.ini
+++ b/test/engine/suite.ini
@@ -9,7 +9,6 @@ config = engine.cfg
 #disabled = replica_join.test.lua
 lua_libs = conflict.lua ../box/lua/utils.lua ../box/lua/push.lua
 is_parallel = True
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/engine_long/suite.ini b/test/engine_long/suite.ini
index 3886b54275..5e6ed71ad5 100644
--- a/test/engine_long/suite.ini
+++ b/test/engine_long/suite.ini
@@ -8,7 +8,6 @@ use_unix_sockets = True
 use_unix_sockets_iproto = True
 config = engine.cfg
 is_parallel = True
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/replication/suite.ini b/test/replication/suite.ini
index e25626cea2..40daa713b8 100644
--- a/test/replication/suite.ini
+++ b/test/replication/suite.ini
@@ -10,7 +10,6 @@ use_unix_sockets = True
 use_unix_sockets_iproto = True
 long_run = prune.test.lua
 is_parallel = True
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/sql-tap/suite.ini b/test/sql-tap/suite.ini
index e230b0e17a..615bd07fa5 100644
--- a/test/sql-tap/suite.ini
+++ b/test/sql-tap/suite.ini
@@ -28,7 +28,6 @@ is_parallel = True
 long_run = gh-3332-tuple-format-leak.test.lua, gh-3083-ephemeral-unref-tuples.test.lua
 config = engine.cfg
 show_reproduce_content = False
-pretest_clean = True
 use_unix_sockets_iproto = True
 fragile = {
     "retries": 10,
diff --git a/test/sql/suite.ini b/test/sql/suite.ini
index 1c0d2f5ad5..6c24a7ea4f 100644
--- a/test/sql/suite.ini
+++ b/test/sql/suite.ini
@@ -9,7 +9,6 @@ is_parallel = True
 lua_libs = lua/sql_tokenizer.lua
 release_disabled = errinj.test.lua view_delayed_wal.test.lua
 disabled = sql-statN-index-drop.test.lua
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/vinyl/suite.ini b/test/vinyl/suite.ini
index dc5e0ec5eb..1bef636723 100644
--- a/test/vinyl/suite.ini
+++ b/test/vinyl/suite.ini
@@ -11,7 +11,6 @@ long_run = stress.test.lua large.test.lua write_iterator_rand.test.lua dump_stre
 is_parallel = True
 # throttle.test.lua temporary disabled for gh-4168
 disabled = throttle.test.lua
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
diff --git a/test/wal_off/suite.ini b/test/wal_off/suite.ini
index cd5c47d2e3..4fdd50ec89 100644
--- a/test/wal_off/suite.ini
+++ b/test/wal_off/suite.ini
@@ -5,7 +5,6 @@ description = tarantool/box, wal_mode = none
 use_unix_sockets = True
 use_unix_sockets_iproto = True
 is_parallel = True
-pretest_clean = True
 disabled = iterator_lt_gt.test.lua
 fragile = {
     "retries": 10,
diff --git a/test/xlog/suite.ini b/test/xlog/suite.ini
index df433973e7..de8509388c 100644
--- a/test/xlog/suite.ini
+++ b/test/xlog/suite.ini
@@ -9,7 +9,6 @@ use_unix_sockets = True
 use_unix_sockets_iproto = True
 long_run = snap_io_rate.test.lua
 is_parallel = True
-pretest_clean = True
 fragile = {
     "retries": 10,
     "tests": {
-- 
GitLab