From 5cbc5b9ea68cab2a8ca880a0c965318244cddb7f Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Mon, 25 Apr 2016 17:17:56 +0300
Subject: [PATCH] Add :get_cluster_vclock() and :wait_cluster_vclock().
---
test-run | 2 +-
test/replication/autobootstrap.result | 16 +++-------------
test/replication/autobootstrap.test.lua | 8 ++------
3 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/test-run b/test-run
index 48553b2394..1fea5cb5c1 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit 48553b239420166e7f7c26dc01f0ec08c36778d6
+Subproject commit 1fea5cb5c13189f829a13b95b16c382222fad05d
diff --git a/test/replication/autobootstrap.result b/test/replication/autobootstrap.result
index 5ec855b3bb..12294eeb47 100644
--- a/test/replication/autobootstrap.result
+++ b/test/replication/autobootstrap.result
@@ -46,13 +46,6 @@ box.info.vclock
_ = test_run:cmd("switch default")
---
...
-vclock = test_run:get_vclock('autobootstrap1')
----
-...
-vclock
----
-- {2: 0, 3: 0, 1: 7}
-...
--
-- Insert rows on each server
--
@@ -80,15 +73,12 @@ _ = test_run:cmd("switch default")
--
-- Synchronize
--
-for i, v in ipairs(vclock) do vclock[i] = v + 1 end
----
-...
-vclock
+vclock = test_run:get_cluster_vclock(SERVERS)
---
-- {2: 1, 3: 1, 1: 8}
...
-for _, name in pairs(SERVERS) do test_run:wait_vclock(name, vclock) end
+test_run:wait_cluster_vclock(SERVERS, vclock)
---
+- {1: 8, 2: 1, 3: 1}
...
--
-- Check result
diff --git a/test/replication/autobootstrap.test.lua b/test/replication/autobootstrap.test.lua
index 616a7f64f9..30186e6e9a 100644
--- a/test/replication/autobootstrap.test.lua
+++ b/test/replication/autobootstrap.test.lua
@@ -24,9 +24,6 @@ _ = test_run:cmd("switch autobootstrap3")
box.info.vclock
_ = test_run:cmd("switch default")
-vclock = test_run:get_vclock('autobootstrap1')
-vclock
-
--
-- Insert rows on each server
--
@@ -42,9 +39,8 @@ _ = test_run:cmd("switch default")
-- Synchronize
--
-for i, v in ipairs(vclock) do vclock[i] = v + 1 end
-vclock
-for _, name in pairs(SERVERS) do test_run:wait_vclock(name, vclock) end
+vclock = test_run:get_cluster_vclock(SERVERS)
+test_run:wait_cluster_vclock(SERVERS, vclock)
--
-- Check result
--
GitLab