From 1433ed8e8a76660fb92ae3bdbe1de7c188a88638 Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Tue, 29 Sep 2020 10:34:53 +0300
Subject: [PATCH] test: move error messages into logs gh-4940
Set error message to log output in test:
replication/gh-3160-misc-heartbeats-on-master-changes.test.lua
---
.../gh-3160-misc-heartbeats-on-master-changes.result | 3 ++-
.../gh-3160-misc-heartbeats-on-master-changes.test.lua | 3 ++-
test/replication/suite.ini | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/test/replication/gh-3160-misc-heartbeats-on-master-changes.result b/test/replication/gh-3160-misc-heartbeats-on-master-changes.result
index 9bce55ae1f..86e5ddfa0c 100644
--- a/test/replication/gh-3160-misc-heartbeats-on-master-changes.result
+++ b/test/replication/gh-3160-misc-heartbeats-on-master-changes.result
@@ -43,7 +43,8 @@ function test_timeout()
for i = 0, 99 do
box.space.test_timeout:replace({1})
if wait_not_follow(replicaA, replicaB) then
- return error(box.info.replication)
+ require('log').error(box.info.replication)
+ return false
end
end
return true
diff --git a/test/replication/gh-3160-misc-heartbeats-on-master-changes.test.lua b/test/replication/gh-3160-misc-heartbeats-on-master-changes.test.lua
index b3d8d2d546..bfc9f854fb 100644
--- a/test/replication/gh-3160-misc-heartbeats-on-master-changes.test.lua
+++ b/test/replication/gh-3160-misc-heartbeats-on-master-changes.test.lua
@@ -25,7 +25,8 @@ function test_timeout()
for i = 0, 99 do
box.space.test_timeout:replace({1})
if wait_not_follow(replicaA, replicaB) then
- return error(box.info.replication)
+ require('log').error(box.info.replication)
+ return false
end
end
return true
diff --git a/test/replication/suite.ini b/test/replication/suite.ini
index 007f4f64c5..7ace6b3b24 100644
--- a/test/replication/suite.ini
+++ b/test/replication/suite.ini
@@ -24,7 +24,7 @@ fragile = {
},
"gh-3160-misc-heartbeats-on-master-changes.test.lua": {
"issues": [ "gh-4940" ],
- "checksums": [ "39b09085bc6398d15324191851d6f556" ]
+ "checksums": [ "945521821b8199c59716e969d89d953d", "b4e60f8ec2d4340bc0324f73e2cc8a01" ]
},
"skip_conflict_row.test.lua": {
"issues": [ "gh-4958" ]
--
GitLab