merging masterck-linkdocs

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/test_pubsub.py b/tests/test_pubsub.py
index e242459..95513a0 100644
--- a/tests/test_pubsub.py
+++ b/tests/test_pubsub.py
@@ -123,6 +123,7 @@ class TestPubSubSubscribeUnsubscribe:
         kwargs = make_subscribe_test_data(r.pubsub(), 'channel')
         self._test_resubscribe_on_reconnection(**kwargs)
 
+    @pytest.mark.onlynoncluster
     def test_resubscribe_to_patterns_on_reconnection(self, r):
         kwargs = make_subscribe_test_data(r.pubsub(), 'pattern')
         self._test_resubscribe_on_reconnection(**kwargs)
@@ -177,6 +178,7 @@ class TestPubSubSubscribeUnsubscribe:
         kwargs = make_subscribe_test_data(r.pubsub(), 'channel')
         self._test_subscribed_property(**kwargs)
 
+    @pytest.mark.onlynoncluster
     def test_subscribe_property_with_patterns(self, r):
         kwargs = make_subscribe_test_data(r.pubsub(), 'pattern')
         self._test_subscribed_property(**kwargs)
@@ -220,6 +222,7 @@ class TestPubSubSubscribeUnsubscribe:
         kwargs = make_subscribe_test_data(r.pubsub(), 'channel')
         self._test_sub_unsub_resub(**kwargs)
 
+    @pytest.mark.onlynoncluster
     def test_sub_unsub_resub_patterns(self, r):
         kwargs = make_subscribe_test_data(r.pubsub(), 'pattern')
         self._test_sub_unsub_resub(**kwargs)
@@ -307,6 +310,7 @@ class TestPubSubMessages:
         assert wait_for_message(p) is None
         assert self.message == make_message('message', 'foo', 'test message')
 
+    @pytest.mark.onlynoncluster
     def test_pattern_message_handler(self, r):
         p = r.pubsub(ignore_subscribe_messages=True)
         p.psubscribe(**{'f*': self.message_handler})
@@ -326,6 +330,9 @@ class TestPubSubMessages:
         assert wait_for_message(p) is None
         assert self.message == make_message('message', channel, 'test message')
 
+    @pytest.mark.onlynoncluster
+    # see: https://redis-py-cluster.readthedocs.io/en/stable/pubsub.html
+    # #known-limitations-with-pubsub
     def test_unicode_pattern_message_handler(self, r):
         p = r.pubsub(ignore_subscribe_messages=True)
         pattern = 'uni' + chr(4456) + '*'
@@ -401,6 +408,7 @@ class TestPubSubAutoDecoding:
                                                         self.channel,
                                                         self.data)
 
+    @pytest.mark.onlynoncluster
     def test_pattern_publish(self, r):
         p = r.pubsub()
         p.psubscribe(self.pattern)
@@ -473,6 +481,7 @@ class TestPubSubRedisDown:
 
 class TestPubSubSubcommands:
 
+    @pytest.mark.onlynoncluster
     @skip_if_server_version_lt('2.8.0')
     def test_pubsub_channels(self, r):
         p = r.pubsub()
@@ -482,6 +491,7 @@ class TestPubSubSubcommands:
         expected = [b'bar', b'baz', b'foo', b'quux']
         assert all([channel in r.pubsub_channels() for channel in expected])
 
+    @pytest.mark.onlynoncluster
     @skip_if_server_version_lt('2.8.0')
     def test_pubsub_numsub(self, r):
         p1 = r.pubsub()
@@ -497,7 +507,7 @@ class TestPubSubSubcommands:
         assert wait_for_message(p3)['type'] == 'subscribe'
 
         channels = [(b'foo', 1), (b'bar', 2), (b'baz', 3)]
-        assert channels == r.pubsub_numsub('foo', 'bar', 'baz')
+        assert r.pubsub_numsub('foo', 'bar', 'baz') == channels
 
     @skip_if_server_version_lt('2.8.0')
     def test_pubsub_numpat(self, r):
@@ -529,6 +539,7 @@ class TestPubSubPings:
                                                    pattern=None)
 
 
+@pytest.mark.onlynoncluster
 class TestPubSubConnectionKilled:
 
     @skip_if_server_version_lt('3.0.0')