Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@dev.tarantool.org
Cc: tarantool-patches@freelists.org, kyukhin@tarantool.org
Subject: [Tarantool-patches] [PATCH 1/1] test: replication/misc cleanup box.cfg.replication
Date: Sun, 13 Oct 2019 17:51:53 +0200	[thread overview]
Message-ID: <955fd35a4bfc91a0d17f3ccbfc7b0ec8bc50715a.1570980933.git.v.shpilevoy@tarantool.org> (raw)

In patch c6bea65f8ef5f6c737cf70c0127189d0ebcbc36e I
added a bug - replication/misc leaves a bad value in
box.cfg.replication. Before that patch the test was
resetting this to empty replication. In my patch I
forgot about that, and left there the value

    {box.cfg.listen, "12345"}

This patch cleans it up.

Follow up #3760
---
Branch: https://github.com/tarantool/tarantool/tree/gerold103/gh-3760-follow-up-flaky-test
Issue: https://github.com/tarantool/tarantool/issues/3760

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

diff --git a/test/replication/misc.result b/test/replication/misc.result
index 3905cc49e..f7098aac8 100644
--- a/test/replication/misc.result
+++ b/test/replication/misc.result
@@ -842,7 +842,7 @@ box.info.status
 - running
 ...
 box.cfg{                                                        \
-    replication = replication,                                  \
+    replication = {},                                           \
     replication_connect_quorum = replication_connect_quorum,    \
     replication_connect_timeout = replication_connect_timeout   \
 }
diff --git a/test/replication/misc.test.lua b/test/replication/misc.test.lua
index 696564f94..c4ddbdb47 100644
--- a/test/replication/misc.test.lua
+++ b/test/replication/misc.test.lua
@@ -342,7 +342,7 @@ box.cfg{                                                        \
 box.cfg{replication = {'localhost:12345'}}
 box.info.status
 box.cfg{                                                        \
-    replication = replication,                                  \
+    replication = {},                                           \
     replication_connect_quorum = replication_connect_quorum,    \
     replication_connect_timeout = replication_connect_timeout   \
 }
-- 
2.21.0 (Apple Git-122)

             reply	other threads:[~2019-10-13 15:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-13 15:51 Vladislav Shpilevoy [this message]
2019-10-17  6:28 ` Kirill Yukhin

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=955fd35a4bfc91a0d17f3ccbfc7b0ec8bc50715a.1570980933.git.v.shpilevoy@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [Tarantool-patches] [PATCH 1/1] test: replication/misc cleanup box.cfg.replication' \
    /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