From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: Kirill Yukhin <kyukhin@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1] test: move error messages for tests into logs (1) Date: Tue, 29 Sep 2020 16:49:41 +0300 [thread overview] Message-ID: <db9ae42b9e38d7a2ced9e20407789136dcc0d7f4.1601387191.git.avtikhon@tarantool.org> (raw) In-Reply-To: <68a49784105d96be398abae0e3f0684d878a4d5a.1601387191.git.avtikhon@tarantool.org> Set error message to log output in test: replication/gh-3160-misc-heartbeats-on-master-changes.test.lua gh-4940 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/flaky-checksums .../gh-3160-misc-heartbeats-on-master-changes.result | 5 ++++- .../gh-3160-misc-heartbeats-on-master-changes.test.lua | 5 ++++- test/replication/suite.ini | 2 +- 3 files changed, 9 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 9bce55ae1..26c369753 100644 --- a/test/replication/gh-3160-misc-heartbeats-on-master-changes.result +++ b/test/replication/gh-3160-misc-heartbeats-on-master-changes.result @@ -34,6 +34,7 @@ end; --- ... function test_timeout() + local log = require('log') local replicaA = box.info.replication[1].upstream or box.info.replication[2].upstream local replicaB = box.info.replication[3].upstream or box.info.replication[2].upstream local follows = test_run:wait_cond(function() @@ -43,7 +44,9 @@ 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) + log.info("test_timeout() failed, box.info.replication:") + log.info(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 b3d8d2d54..480d4ae6c 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 @@ -16,6 +16,7 @@ function wait_not_follow(replicaA, replicaB) end, box.cfg.replication_timeout) end; function test_timeout() + local log = require('log') local replicaA = box.info.replication[1].upstream or box.info.replication[2].upstream local replicaB = box.info.replication[3].upstream or box.info.replication[2].upstream local follows = test_run:wait_cond(function() @@ -25,7 +26,9 @@ 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) + log.info("test_timeout() failed, box.info.replication:") + log.info(box.info.replication) + return false end end return true diff --git a/test/replication/suite.ini b/test/replication/suite.ini index 007f4f64c..d32d76753 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": [ "39b09085bc6398d15324191851d6f556", "20b7bf9ce51a1a936da3f465db42bd62" ] }, "skip_conflict_row.test.lua": { "issues": [ "gh-4958" ] -- 2.25.1
next prev parent reply other threads:[~2020-09-29 13:49 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-29 13:47 [Tarantool-patches] [PATCH v1] test: flaky replication/replica_rejoin.test.lua Alexander V. Tikhonov 2020-09-29 13:49 ` Alexander V. Tikhonov [this message] 2020-10-01 22:10 ` [Tarantool-patches] [PATCH v1] test: move error messages for tests into logs (1) Vladislav Shpilevoy 2020-09-29 13:49 ` [Tarantool-patches] [PATCH v1] test: move error messages for tests into logs (2) Alexander V. Tikhonov 2020-10-01 22:10 ` [Tarantool-patches] [PATCH v1] test: flaky replication/replica_rejoin.test.lua Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=db9ae42b9e38d7a2ced9e20407789136dcc0d7f4.1601387191.git.avtikhon@tarantool.org \ --to=avtikhon@tarantool.org \ --cc=kyukhin@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1] test: move error messages for tests into logs (1)' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox