From ea9811c73d474c6c0b38f90ad4e0a043bd3fca39 Mon Sep 17 00:00:00 2001
From: Ted Kaemming <ted@kaemming.com>
Date: Wed, 11 Oct 2017 15:08:19 -0700
Subject: [PATCH] fix(tests): Improve test compatibility with redis==2.10.6

This resolves an unrelated test failure from GH-23 when running with the
latest `redis` (library, not server) version instead of 2.10.5 (which is
also still supported.)
---
 tests/test_cluster.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/test_cluster.py b/tests/test_cluster.py
index 677d7c7..22246c5 100644
--- a/tests/test_cluster.py
+++ b/tests/test_cluster.py
@@ -232,9 +232,17 @@ def test_batch_promise_all(cluster):
 
 
 def test_execute_commands(cluster):
-    TestScript = Script(None, 'return {KEYS, ARGV}')
-
-    assert not TestScript.sha
+    TestScript = Script(
+        cluster.get_local_client(0),
+        'return {KEYS, ARGV}',
+    )
+
+    # XXX: redis<2.10.6 didn't require that a ``Script`` be instantiated with a
+    # valid client as part of the constructor, which resulted in the SHA not
+    # actually being set until the script was executed. To ensure the legacy
+    # behavior still works, we manually unset the cached SHA before executing.
+    actual_script_hash = TestScript.sha
+    TestScript.sha = None
 
     results = cluster.execute_commands({
         'foo': [
@@ -249,7 +257,7 @@ def test_execute_commands(cluster):
         ],
     })
 
-    assert TestScript.sha
+    assert TestScript.sha == actual_script_hash
 
     assert results['foo'][0].value
     assert results['foo'][1].value == [['key'], ['value']]