some hashring tests added

contrust · contrust · commit b7f820e65ede · 2021-12-23T00:36:54.000+05:00
diff --git a/hashring/__main__.py b/hashring/__main__.py
@@ -6,7 +6,7 @@
 from hashring.hashring import HashRing
 
 
-def parse_arguments():
+def parse_arguments(args):
     parser = argparse.ArgumentParser(
         prog=None if not globals().get('__spec__')
         else f'python3 -m {__spec__.name.partition(".")[0]}'
@@ -31,7 +31,7 @@ def parse_arguments():
     methods.add_argument('-i', '--info',
                          metavar="input_file",
                          help='show ring info')
-    return parser.parse_args()
+    return parser.parse_args(args)
 
 
 def show_ring_info(ring: HashRing):
@@ -52,7 +52,7 @@ def unload_ring(ring: HashRing, path: str):
 
 
 def main():
-    args_dict = vars(parse_arguments())
+    args_dict = vars(parse_arguments(sys.argv[1:]))
     if args_dict['add_host']:
         host = args_dict['add_host'][0]
         input_file = args_dict['add_host'][1]
diff --git a/server/__main__.py b/server/__main__.py
@@ -17,7 +17,7 @@
 from server.router_request_handler import RouterRequestHandler
 
 
-def parse_arguments():
+def parse_arguments(args):
     parser = argparse.ArgumentParser(
         prog=None if not globals().get('__spec__')
         else f'python3 -m {__spec__.name.partition(".")[0]}'
@@ -40,7 +40,7 @@ def parse_arguments():
                              action='store_true')
     server_type.add_argument('-rt', '--router',
                              action='store_true')
-    return parser.parse_args()
+    return parser.parse_args(args)
 
 
 def run_server(handler: RequestHandler, hostname: str, port: int):
@@ -54,7 +54,7 @@ def run_server(handler: RequestHandler, hostname: str, port: int):
 
 
 def main():
-    args_dict = vars(parse_arguments())
+    args_dict = vars(parse_arguments(sys.argv[1:]))
     config = DatabaseConfig() if args_dict['database'] else RouterConfig()
     if args_dict['update']:
         host = args_dict['update'][0]
diff --git a/tests/test_four_parts_hash_storage.py b/tests/test_four_parts_hash_storage.py
@@ -91,7 +91,7 @@ def test_return_none_if_get_not_inserted_key():
     assert value is None
 
 
-def test_do_nothing_if_delete_not_inserted_key(chdir_to_temp_directory):
+def test_exception_is_not_raised_if_delete_not_inserted_key():
     storage = create_four_parts_hash_storage_in_current_directory()
     try:
         storage.delete('hello')
diff --git a/tests/test_hashring.py b/tests/test_hashring.py
@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from hashring.hashring import HashRing
 
 ONE_NODE_LIST = ['localhost:2020']
@@ -60,3 +62,25 @@ def test_keys_do_not_change_if_add_existing_node():
     old_keys = ring.keys.copy()
     ring.add_node(ONE_NODE_LIST[0])
     assert old_keys.items() == ring.keys.items()
+
+
+@patch('hashring.hashring.hash_to_32bit_int', lambda x: 150)
+def test_found_node_for_str_is_node_with_nearest_from_left_key_for_str_hash():
+    ring = HashRing(TWO_NODE_LIST, 0, 0)
+    ring.keys[100] = 'localhost:2020'
+    ring.keys[200] = 'localhost:2021'
+    ring.keys[10000] = 'localhost:2020'
+    ring.keys[100000] = 'localhost:2021'
+    key = 'makaka'
+    found_node = ring.find_node_for_string(key)
+    assert found_node == 'localhost:2020'
+
+
+@patch('hashring.hashring.hash_to_32bit_int', lambda x: 99)
+def test_node_for_str_is_with_max_key_if_str_hash_less_than_all_keys():
+    ring = HashRing(TWO_NODE_LIST, 0, 0)
+    ring.keys[100] = 'localhost:2020'
+    ring.keys[200] = 'localhost:2021'
+    key = 'makaka'
+    found_node = ring.find_node_for_string(key)
+    assert found_node == 'localhost:2021'
