From 2ebcd63d6a011dc46df26d27b860209a28efe727 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 9 Jun 2020 12:19:14 +0200
Subject: [PATCH] Adapt EVAL+busy script test to new behavior.

---
 tests/unit/multi.tcl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/unit/multi.tcl b/tests/unit/multi.tcl
index 55f18bec8..0c70fbde7 100644
--- a/tests/unit/multi.tcl
+++ b/tests/unit/multi.tcl
@@ -363,6 +363,9 @@ start_server {tags {"multi"}} {
         set xx [r get xx]
         # make sure that either the whole transcation passed or none of it (we actually expect none)
         assert { $xx == 1 || $xx == 3}
+        # Discard the transaction since EXEC likely got -BUSY error
+        # so the client is still in MULTI state.
+        catch { $rd2 discard ;$rd2 read } e
         # check that the connection is no longer in multi state
         $rd2 ping asdf
         set pong [$rd2 read]
-- 
GitLab