From 209d76515065010c0a3f1e0954bed46a51e56cd6 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 29 Nov 2016 11:00:12 +0300
Subject: [PATCH] Fix sporadically failing test/xlog/snapshot_daemon.test.lua
Time calculation is too accurate.
---
test/xlog/snapshot_daemon.result | 12 ++++++------
test/xlog/snapshot_daemon.test.lua | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/xlog/snapshot_daemon.result b/test/xlog/snapshot_daemon.result
index 1a41c65d18..ca449b3a65 100644
--- a/test/xlog/snapshot_daemon.result
+++ b/test/xlog/snapshot_daemon.result
@@ -142,11 +142,11 @@ box.cfg{ snapshot_count = 2, snapshot_period = PERIOD}
snapshot_time, time = daemon.next_snapshot_time, fiber.time()
---
...
-snapshot_time >= time + PERIOD
+snapshot_time + 1 >= time + PERIOD or {snapshot_time, time, PERIOD}
---
- true
...
-snapshot_time <= time + 2 * PERIOD
+snapshot_time - 1 <= time + 2 * PERIOD or {snapshot_time, time, PERIOD}
---
- true
...
@@ -166,11 +166,11 @@ box.cfg{ snapshot_count = 2, snapshot_period = PERIOD}
snapshot_time, time = daemon.next_snapshot_time, fiber.time()
---
...
-snapshot_time >= time + PERIOD
+snapshot_time + 1 >= time + PERIOD or {snapshot_time, time, PERIOD}
---
- true
...
-snapshot_time <= time + 2 * PERIOD
+snapshot_time - 1 <= time + 2 * PERIOD or {snapshot_time, time, PERIOD}
---
- true
...
@@ -192,11 +192,11 @@ box.cfg{ snapshot_count = 2, snapshot_period = PERIOD}
snapshot_time, time = daemon.next_snapshot_time, fiber.time()
---
...
-snapshot_time >= time + PERIOD
+snapshot_time + 1 >= time + PERIOD or {snapshot_time, time, PERIOD}
---
- true
...
-snapshot_time <= time + 2 * PERIOD
+snapshot_time - 1 <= time + 2 * PERIOD or {snapshot_time, time, PERIOD}
---
- true
...
diff --git a/test/xlog/snapshot_daemon.test.lua b/test/xlog/snapshot_daemon.test.lua
index 979d74b266..b5fb06c963 100644
--- a/test/xlog/snapshot_daemon.test.lua
+++ b/test/xlog/snapshot_daemon.test.lua
@@ -77,8 +77,8 @@ box.cfg{ snapshot_count = 0 }
PERIOD = 3600
box.cfg{ snapshot_count = 2, snapshot_period = PERIOD}
snapshot_time, time = daemon.next_snapshot_time, fiber.time()
-snapshot_time >= time + PERIOD
-snapshot_time <= time + 2 * PERIOD
+snapshot_time + 1 >= time + PERIOD or {snapshot_time, time, PERIOD}
+snapshot_time - 1 <= time + 2 * PERIOD or {snapshot_time, time, PERIOD}
daemon_fiber = daemon.fiber
daemon_control = daemon.control
@@ -87,8 +87,8 @@ daemon_control = daemon.control
PERIOD = 100
box.cfg{ snapshot_count = 2, snapshot_period = PERIOD}
snapshot_time, time = daemon.next_snapshot_time, fiber.time()
-snapshot_time >= time + PERIOD
-snapshot_time <= time + 2 * PERIOD
+snapshot_time + 1 >= time + PERIOD or {snapshot_time, time, PERIOD}
+snapshot_time - 1 <= time + 2 * PERIOD or {snapshot_time, time, PERIOD}
daemon.fiber == daemon_fiber
daemon.control == daemon_control
@@ -96,8 +96,8 @@ daemon.control == daemon_control
PERIOD = 1000
box.cfg{ snapshot_count = 2, snapshot_period = PERIOD}
snapshot_time, time = daemon.next_snapshot_time, fiber.time()
-snapshot_time >= time + PERIOD
-snapshot_time <= time + 2 * PERIOD
+snapshot_time + 1 >= time + PERIOD or {snapshot_time, time, PERIOD}
+snapshot_time - 1 <= time + 2 * PERIOD or {snapshot_time, time, PERIOD}
daemon.fiber == daemon_fiber
daemon.control == daemon_control
--
GitLab