From 7ea5fc434f90c37ca67dfd506abbcbb085698e99 Mon Sep 17 00:00:00 2001
From: alyapunov <aleks@tarantool.org>
Date: Tue, 13 Jun 2017 19:17:54 +0300
Subject: [PATCH] Fix tx_conflict.test
Some verification spaces (q1 and q2) are not truncated before
every test round and that sometimes causes wrong results.
Fix it.
---
test/vinyl/tx_conflict.result | 4 ++++
test/vinyl/tx_conflict.test.lua | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/test/vinyl/tx_conflict.result b/test/vinyl/tx_conflict.result
index aa8bbe140d..0b1c8c6d95 100644
--- a/test/vinyl/tx_conflict.result
+++ b/test/vinyl/tx_conflict.result
@@ -126,6 +126,10 @@ function prepare()
end
s1:truncate()
s2:truncate()
+ if ignore_unnecessary_conflict1 then
+ q1:truncate()
+ q2:truncate()
+ end
for i=1,num_key do
local r = math.random(5)
local v = get_unique_value()
diff --git a/test/vinyl/tx_conflict.test.lua b/test/vinyl/tx_conflict.test.lua
index 6a98d7f5c8..1dfa533ef6 100644
--- a/test/vinyl/tx_conflict.test.lua
+++ b/test/vinyl/tx_conflict.test.lua
@@ -95,6 +95,10 @@ function prepare()
end
s1:truncate()
s2:truncate()
+ if ignore_unnecessary_conflict1 then
+ q1:truncate()
+ q2:truncate()
+ end
for i=1,num_key do
local r = math.random(5)
local v = get_unique_value()
--
GitLab