tests: Fix storage instantiation deprecated args

swh/web/config.py

@@ -128,9 +128,7 @@ DEFAULT_CONFIG = {
         "dict",
         {
             "cls": "remote",
-            "args": {
-                "url": "http://127.0.0.1:5005/",
-            },
+            "url": "http://127.0.0.1:5005/",
         },
     ),
     "scheduler": ("dict", {"cls": "remote", "url": "http://127.0.0.1:5008/"}),
@@ -227,7 +225,7 @@ DEFAULT_CONFIG = {
 swhweb_config: Dict[str, Any] = {}
 
 
-def get_config(config_file="web/web"):
+def get_config(config_file: str = "web/web") -> Dict[str, Any]:
     """Read the configuration file `config_file`.
 
     If an environment variable SWH_CONFIG_FILENAME is defined, this
@@ -240,7 +238,6 @@ def get_config(config_file="web/web"):
     configuration.
 
     """
-
     if not swhweb_config:
         config_filename = os.environ.get("SWH_CONFIG_FILENAME")
         if config_filename:
@@ -259,6 +256,7 @@ def get_config(config_file="web/web"):
         )
         swhweb_config["scheduler"] = get_scheduler(**swhweb_config["scheduler"])
         swhweb_config["counters"] = get_counters(**swhweb_config["counters"])
+
     return swhweb_config
 
 

swh/web/tests/data.py

@@ -52,11 +52,9 @@ _TEST_INDEXER_BASE_CONFIG = {
     "storage": {"cls": "memory"},
     "objstorage": {
         "cls": "memory",
-        "args": {},
     },
     "indexer_storage": {
         "cls": "memory",
-        "args": {},
     },
 }
 
@@ -439,7 +437,7 @@ def _init_tests_data():
         if content.sha1 in content_path:
             path = content_path[content.sha1]
 
-        cnt_data = storage.content_get_data(content.sha1)
+        cnt_data = storage.content_get_data({"sha1": content.sha1})
         assert cnt_data is not None
         mimetype, encoding = get_mimetype_and_encoding_for_content(cnt_data)
         _, _, cnt_data = re_encode_content(mimetype, encoding, cnt_data)