tests: factor out common/utils.py

Consolidate test data loading code in common/utils.py

Move `test/fixtures` to `test/data/fixtures` to simplify resource
dependencies in BUCK.

Signed-off-by: Ihor Solodrai <[email protected]>

Author: theihor

tests/__init__.py

@@ -6,16 +6,6 @@
 
 # pyre-strict
 
-import importlib.resources
 import logging
 
 logging.disable()
-
-
-def read_fixture(filepath: str) -> str:
-    return (
-        importlib.resources.files(__package__)
-        .joinpath("fixtures")
-        .joinpath(filepath)
-        .read_text()
-    )

tests/common/patchwork_mock.py

@@ -6,11 +6,9 @@
 
 # pyre-unsafe
 
-import json
-import os
 import re
 
-from typing import Any, Dict, Final, List
+from typing import Any, Dict, Final
 
 from aioresponses import aioresponses
 
@@ -86,33 +84,6 @@ def get_dict_key(d: Dict[str, Any], idx: int = 0) -> str:
     return list(d)[idx]
 
 
-def load_test_data_file(file):
-    with open(file, "r") as f:
-        if file.endswith(".json"):
-            return json.load(f)
-        else:
-            return f.read()
-
-
-def load_test_data(path) -> Dict[str, Any]:
-    jsons_by_path = {}
-    with open(os.path.join(path, "responses.json"), "r") as f:
-        jsons_by_path = json.load(f)
-    data = {}
-    for url, value in jsons_by_path.items():
-        match value:
-            case str():
-                filepath = os.path.join(path, value)
-                data[url] = load_test_data_file(filepath)
-            case list():
-                lst = []
-                for filename in value:
-                    filepath = os.path.join(path, filename)
-                    lst.append(load_test_data_file(filepath))
-                data[url] = lst
-    return data
-
-
 FOO_SERIES_FIRST = 2
 FOO_SERIES_LAST = 10
 

tests/common/utils.py

@@ -0,0 +1,46 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+import json
+import os
+from typing import Any, Dict
+
+
+def load_test_data_file(file):
+    with open(file, "r") as f:
+        if file.endswith(".json"):
+            return json.load(f)
+        else:
+            return f.read()
+
+
+def load_test_data(path) -> Dict[str, Any]:
+    jsons_by_path = {}
+    with open(os.path.join(path, "responses.json"), "r") as f:
+        jsons_by_path = json.load(f)
+    data = {}
+    for url, value in jsons_by_path.items():
+        match value:
+            case str():
+                filepath = os.path.join(path, value)
+                data[url] = load_test_data_file(filepath)
+            case list():
+                lst = []
+                for filename in value:
+                    filepath = os.path.join(path, filename)
+                    lst.append(load_test_data_file(filepath))
+                data[url] = lst
+    return data
+
+
+def read_test_data_file(relative_path: str) -> str:
+    path = os.path.join(os.path.dirname(__file__), "../data", relative_path)
+    with open(path, "r") as f:
+        return f.read()
+
+
+def read_fixture(filename: str) -> str:
+    return read_test_data_file(f"fixtures/{filename}")