diff options
author | dvora-h <67596500+dvora-h@users.noreply.github.com> | 2022-04-04 12:33:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-04 12:33:58 +0300 |
commit | d41f8aab791fe0d9a620f99ad0b277f5eed47c5f (patch) | |
tree | e790b23db8c53d381f7b03b5d6d84997ff89f5c8 /tests/test_cluster.py | |
parent | 17f1140506310748a4f8164259d73fd0a4d362d5 (diff) | |
download | redis-py-d41f8aab791fe0d9a620f99ad0b277f5eed47c5f.tar.gz |
Clean up test supoort enterprise environments (#2082)
* skip tests on enterprise
* delete dping implementation
Diffstat (limited to 'tests/test_cluster.py')
-rw-r--r-- | tests/test_cluster.py | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/test_cluster.py b/tests/test_cluster.py index ecc8624..1ee5cdf 100644 --- a/tests/test_cluster.py +++ b/tests/test_cluster.py @@ -629,6 +629,7 @@ class TestRedisClusterObj: assert replica.server_type == REPLICA assert replica in slot_nodes + @skip_if_redis_enterprise() def test_not_require_full_coverage_cluster_down_error(self, r): """ When require_full_coverage is set to False (default client config) and not @@ -840,11 +841,13 @@ class TestClusterRedisCommands: channels = [(b"foo", 1), (b"bar", 2), (b"baz", 3)] assert r.pubsub_numsub("foo", "bar", "baz", target_nodes="all") == channels + @skip_if_redis_enterprise() def test_cluster_myid(self, r): node = r.get_random_node() myid = r.cluster_myid(node) assert len(myid) == 40 + @skip_if_redis_enterprise() def test_cluster_slots(self, r): mock_all_nodes_resp(r, default_cluster_slots) cluster_slots = r.cluster_slots() @@ -853,17 +856,20 @@ class TestClusterRedisCommands: assert cluster_slots.get((0, 8191)) is not None assert cluster_slots.get((0, 8191)).get("primary") == ("127.0.0.1", 7000) + @skip_if_redis_enterprise() def test_cluster_addslots(self, r): node = r.get_random_node() mock_node_resp(node, "OK") assert r.cluster_addslots(node, 1, 2, 3) is True @skip_if_server_version_lt("7.0.0") + @skip_if_redis_enterprise() def test_cluster_addslotsrange(self, r): node = r.get_random_node() mock_node_resp(node, "OK") assert r.cluster_addslotsrange(node, 1, 5) + @skip_if_redis_enterprise() def test_cluster_countkeysinslot(self, r): node = r.nodes_manager.get_node_from_slot(1) mock_node_resp(node, 2) @@ -873,6 +879,7 @@ class TestClusterRedisCommands: mock_all_nodes_resp(r, 0) assert r.cluster_count_failure_report("node_0") == 0 + @skip_if_redis_enterprise() def test_cluster_delslots(self): cluster_slots = [ [ @@ -897,12 +904,14 @@ class TestClusterRedisCommands: assert node1.redis_connection.connection.read_response.called @skip_if_server_version_lt("7.0.0") + @skip_if_redis_enterprise() def test_cluster_delslotsrange(self, r): node = r.get_random_node() mock_node_resp(node, "OK") r.cluster_addslots(node, 1, 2, 3, 4, 5) assert r.cluster_delslotsrange(1, 5) + @skip_if_redis_enterprise() def test_cluster_failover(self, r): node = r.get_random_node() mock_node_resp(node, "OK") @@ -912,20 +921,24 @@ class TestClusterRedisCommands: with pytest.raises(RedisError): r.cluster_failover(node, "FORCT") + @skip_if_redis_enterprise() def test_cluster_info(self, r): info = r.cluster_info() assert isinstance(info, dict) assert info["cluster_state"] == "ok" + @skip_if_redis_enterprise() def test_cluster_keyslot(self, r): mock_all_nodes_resp(r, 12182) assert r.cluster_keyslot("foo") == 12182 + @skip_if_redis_enterprise() def test_cluster_meet(self, r): node = r.get_default_node() mock_node_resp(node, "OK") assert r.cluster_meet("127.0.0.1", 6379) is True + @skip_if_redis_enterprise() def test_cluster_nodes(self, r): response = ( "c8253bae761cb1ecb2b61857d85dfe455a0fec8b 172.17.0.7:7006 " @@ -954,6 +967,7 @@ class TestClusterRedisCommands: == "c8253bae761cb1ecb2b61857d85dfe455a0fec8b" ) + @skip_if_redis_enterprise() def test_cluster_replicate(self, r): node = r.get_random_node() all_replicas = r.get_replicas() @@ -966,6 +980,7 @@ class TestClusterRedisCommands: else: assert results is True + @skip_if_redis_enterprise() def test_cluster_reset(self, r): mock_all_nodes_resp(r, "OK") assert r.cluster_reset() is True @@ -974,6 +989,7 @@ class TestClusterRedisCommands: for res in all_results.values(): assert res is True + @skip_if_redis_enterprise() def test_cluster_save_config(self, r): node = r.get_random_node() all_nodes = r.get_nodes() @@ -983,6 +999,7 @@ class TestClusterRedisCommands: for res in all_results.values(): assert res is True + @skip_if_redis_enterprise() def test_cluster_get_keys_in_slot(self, r): response = [b"{foo}1", b"{foo}2"] node = r.nodes_manager.get_node_from_slot(12182) @@ -990,6 +1007,7 @@ class TestClusterRedisCommands: keys = r.cluster_get_keys_in_slot(12182, 4) assert keys == response + @skip_if_redis_enterprise() def test_cluster_set_config_epoch(self, r): mock_all_nodes_resp(r, "OK") assert r.cluster_set_config_epoch(3) is True @@ -997,6 +1015,7 @@ class TestClusterRedisCommands: for res in all_results.values(): assert res is True + @skip_if_redis_enterprise() def test_cluster_setslot(self, r): node = r.get_random_node() mock_node_resp(node, "OK") @@ -1014,6 +1033,7 @@ class TestClusterRedisCommands: assert r.cluster_setslot_stable(12182) is True assert node.redis_connection.connection.read_response.called + @skip_if_redis_enterprise() def test_cluster_replicas(self, r): response = [ b"01eca22229cf3c652b6fca0d09ff6941e0d2e3 " @@ -1045,6 +1065,7 @@ class TestClusterRedisCommands: for i in range(0, len(res) - 1, 2): assert res[i][3] == res[i + 1][3] + @skip_if_redis_enterprise() def test_readonly(self): r = get_mocked_redis_client(host=default_host, port=default_port) mock_all_nodes_resp(r, "OK") @@ -1055,6 +1076,7 @@ class TestClusterRedisCommands: for replica in r.get_replicas(): assert replica.redis_connection.connection.read_response.called + @skip_if_redis_enterprise() def test_readwrite(self): r = get_mocked_redis_client(host=default_host, port=default_port) mock_all_nodes_resp(r, "OK") @@ -1065,6 +1087,7 @@ class TestClusterRedisCommands: for replica in r.get_replicas(): assert replica.redis_connection.connection.read_response.called + @skip_if_redis_enterprise() def test_bgsave(self, r): assert r.bgsave() sleep(0.3) @@ -1149,10 +1172,12 @@ class TestClusterRedisCommands: assert isinstance(r.memory_usage("foo"), int) @skip_if_server_version_lt("4.0.0") + @skip_if_redis_enterprise() def test_memory_malloc_stats(self, r): assert r.memory_malloc_stats() @skip_if_server_version_lt("4.0.0") + @skip_if_redis_enterprise() def test_memory_stats(self, r): # put a key into the current db to make sure that "db.<current-db>" # has data @@ -1174,6 +1199,7 @@ class TestClusterRedisCommands: with pytest.raises(NotImplementedError): r.memory_doctor() + @skip_if_redis_enterprise() def test_lastsave(self, r): node = r.get_primaries()[0] assert isinstance(r.lastsave(target_nodes=node), datetime.datetime) @@ -1216,6 +1242,7 @@ class TestClusterRedisCommands: r.client_pause(timeout="not an integer", target_nodes=node) @skip_if_server_version_lt("6.2.0") + @skip_if_redis_enterprise() def test_client_unpause(self, r): assert r.client_unpause() |