Clean code and add scenario for debug test

Signed-off-by: Nihal Mehta <[email protected]>
valkey-io · Nov 27, 2024 · dc303c1 · dc303c1
1 parent 0232f2d
commit dc303c1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/tests/test_aofrewrite.py b/tests/test_aofrewrite.py
@@ -33,7 +33,6 @@ def test_basic_aofrewrite_and_restore(self):
         self.server.restart(remove_rdb=False, remove_nodes_conf=False, connect_client=True)
         assert self.server.is_alive()
         restored_server_digest = client.debug_digest()
-        assert restored_server_digest != None or 0000000000000000000000000000000000000000
         restored_object_digest = client.execute_command('DEBUG DIGEST-VALUE testSave')
         assert restored_server_digest == server_digest
         assert restored_object_digest == object_digest
@@ -71,7 +70,6 @@ def test_aofrewrite_bloomfilter_metrics(self):
         self.server.restart(remove_rdb=False, remove_nodes_conf=False, connect_client=True)
         assert self.server.is_alive()
         restored_server_digest = self.client.debug_digest()
-        assert restored_server_digest != None or 0000000000000000000000000000000000000000
         restored_object_digest = self.client.execute_command('DEBUG DIGEST-VALUE key1')
         assert restored_server_digest == server_digest
         assert restored_object_digest == object_digest

diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -255,28 +255,39 @@ def test_debug_cmd(self):
         default_obj = client.execute_command('BF.RESERVE default_obj 0.001 1000')
         default_object_digest = client.execute_command('DEBUG DIGEST-VALUE default_obj')
 
+        # scenario1 validates that digest differs on bloom objects (with same properties) when different items are added.
         scenario1_obj = client.execute_command('BF.INSERT scenario1 error 0.001 capacity 1000 items 1')
         scenario1_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario1')
         assert scenario1_obj != default_obj
         assert scenario1_object_digest != default_object_digest
 
+        # scenario2 validates that digest differs on bloom objects with different false positive rate.
         scenario2_obj = client.execute_command('BF.INSERT scenario2 error 0.002 capacity 1000 items 1')
         scenario2_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario2')
         assert scenario2_obj != default_obj
         assert scenario2_object_digest != default_object_digest
 
+        # scenario3 validates that digest differs on bloom objects with different expansion.
         scenario3_obj = client.execute_command('BF.INSERT scenario3 error 0.002 capacity 1000 expansion 3 items 1')
         scenario3_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario3')
         assert scenario3_obj != default_obj
         assert scenario3_object_digest != default_object_digest
 
-        scenario4_obj = client.execute_command('BF.INSERT scenario4 error 0.001 capacity 1000 items 1')
+
+        # scenario4 validates that digest differs on bloom objects with different capacity.
+        scenario4_obj = client.execute_command('BF.INSERT scenario4 error 0.001 capacity 2000 items 1')
         scenario4_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario4')
         assert scenario4_obj != default_obj
         assert scenario4_object_digest != default_object_digest
 
+        # scenario5 validates that digest is equal on bloom objects with same properties and same items.
+        scenario5_obj = client.execute_command('BF.INSERT scenario5 error 0.001 capacity 1000 items 1')
+        scenario5_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario5')
+        assert scenario5_obj != default_obj
+        assert scenario5_object_digest != default_object_digest
+
         client.execute_command('BF.MADD default_obj 1 2 3')
-        client.execute_command('BF.MADD scenario4 2 3')
+        client.execute_command('BF.MADD scenario5 2 3')
         madd_default_object_digest = client.execute_command('DEBUG DIGEST-VALUE default_obj')
-        madd_scenario_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario4')
+        madd_scenario_object_digest = client.execute_command('DEBUG DIGEST-VALUE scenario5')
         assert madd_scenario_object_digest == madd_default_object_digest
diff --git a/tests/test_replication.py b/tests/test_replication.py
@@ -75,7 +75,6 @@ def test_replication_behavior(self):
             object_digest_primary = self.client.execute_command('DEBUG DIGEST-VALUE key')
             server_digest_replica = self.client.debug_digest()
             assert server_digest_primary == server_digest_replica
-            assert server_digest_replica != None or 0000000000000000000000000000000000000000
             debug_digest_replica = self.replicas[0].client.execute_command('DEBUG DIGEST-VALUE key')
             assert object_digest_primary == debug_digest_replica
 

diff --git a/tests/test_save_and_restore.py b/tests/test_save_and_restore.py
@@ -31,7 +31,6 @@ def test_basic_save_and_restore(self):
         assert uptime_in_sec_1 > uptime_in_sec_2
         assert self.server.is_rdb_done_loading()
         restored_server_digest = client.debug_digest()
-        assert restored_server_digest != None or 0000000000000000000000000000000000000000
         restored_object_digest = client.execute_command('DEBUG DIGEST-VALUE testSave')
         assert restored_server_digest == server_digest
         assert restored_object_digest == object_digest