Added test case

Author: vladvildanov

redis/cluster.py

@@ -2983,16 +2983,24 @@ def _determine_nodes(self, *args, **kwargs) -> List["ClusterNode"]:
             return [node]
 
     def multi(self):
-        raise RedisClusterException("method multi() is not supported outside of transactional context")
+        raise RedisClusterException(
+            "method multi() is not supported outside of transactional context"
+        )
 
     def discard(self):
-        raise RedisClusterException("method discard() is not supported outside of transactional context")
+        raise RedisClusterException(
+            "method discard() is not supported outside of transactional context"
+        )
 
     def watch(self, *names):
-        raise RedisClusterException("method watch() is not supported outside of transactional context")
+        raise RedisClusterException(
+            "method watch() is not supported outside of transactional context"
+        )
 
     def unwatch(self, *names):
-        raise RedisClusterException("method unwatch() is not supported outside of transactional context")
+        raise RedisClusterException(
+            "method unwatch() is not supported outside of transactional context"
+        )
 
     def delete(self, *names):
         if len(names) != 1:
@@ -3136,7 +3144,7 @@ def _send_command_parse_response(
     def _reinitialize_on_error(self, error):
         if self._watching:
             if self.slot_migrating and self._executing:
-                raise WatchError("Slot rebalancing ocurred while watching keys")
+                raise WatchError("Slot rebalancing occurred while watching keys")
 
         if self.slot_migrating or self._cluster_error:
             if self._transaction_connection:

tests/test_cluster.py

@@ -3420,7 +3420,9 @@ def test_pipeline_discard(self, r):
             with pytest.raises(redis.exceptions.RedisClusterException) as ex:
                 pipe.discard()
 
-            assert str(ex.value).startswith("method discard() is not supported outside of transactional context")
+            assert str(ex.value).startswith(
+                "method discard() is not supported outside of transactional context"
+            )
 
         # setting a pipeline and discarding should do the same
         with r.pipeline() as pipe:
@@ -3431,7 +3433,9 @@ def test_pipeline_discard(self, r):
             with pytest.raises(redis.exceptions.RedisClusterException) as ex:
                 pipe.discard()
 
-            assert str(ex.value).startswith("method discard() is not supported outside of transactional context")
+            assert str(ex.value).startswith(
+                "method discard() is not supported outside of transactional context"
+            )
 
             pipe.set(f"{hashkey}:foo", "bar")
             response = pipe.execute()

tests/test_cluster_transaction.py

@@ -5,7 +5,7 @@
 import pytest
 
 import redis
-from redis import CrossSlotTransactionError, ConnectionPool
+from redis import CrossSlotTransactionError, ConnectionPool, RedisClusterException
 from redis.backoff import NoBackoff
 from redis.client import Redis
 from redis.cluster import PRIMARY, ClusterNode, NodesManager, RedisCluster
@@ -36,14 +36,12 @@ def _find_source_and_target_node_for_slot(
 
 
 class TestClusterTransaction:
-
     @pytest.mark.onlycluster
     def test_pipeline_is_true(self, r):
         "Ensure pipeline instances are not false-y"
         with r.pipeline(transaction=True) as pipe:
             assert pipe
 
-
     @pytest.mark.onlycluster
     def test_pipeline_empty_transaction(self, r):
         r["a"] = 0
@@ -92,6 +90,15 @@ def test_throws_exception_on_different_hash_slots(self, r):
             ):
                 tx.execute()
 
+    @pytest.mark.onlycluster
+    def test_throws_exception_with_watch_on_different_hash_slots(self, r):
+        with r.pipeline(transaction=True) as tx:
+            with pytest.raises(
+                RedisClusterException,
+                match="WATCH - all keys must map to the same key slot",
+            ):
+                tx.watch("key1", "key2")
+
     @pytest.mark.onlycluster
     def test_transaction_with_watched_keys(self, r):
         r["a"] = 0
@@ -257,7 +264,7 @@ def ask_redirect_effect(conn, *args, **options):
                     pipe.execute()
 
                 assert str(ex.value).startswith(
-                    "Slot rebalancing ocurred while watching keys"
+                    "Slot rebalancing occurred while watching keys"
                 )
 
     @pytest.mark.onlycluster
@@ -284,7 +291,9 @@ def test_retry_transaction_on_connection_error(self, r, mock_connection):
             assert pipe.execute() == [b"OK"]
 
     @pytest.mark.onlycluster
-    def test_retry_transaction_on_connection_error_with_watched_keys(self, r, mock_connection):
+    def test_retry_transaction_on_connection_error_with_watched_keys(
+        self, r, mock_connection
+    ):
         key = "book"
         slot = r.keyslot(key)
 
@@ -342,7 +351,6 @@ def test_parse_error_raised(self, r):
             assert pipe.set(f"{hashkey}:z", "zzz").execute() == [b"OK"]
             assert r[f"{hashkey}:z"] == b"zzz"
 
-
     @pytest.mark.onlycluster
     def test_transaction_callable(self, r):
         hashkey = "{key}"