Type the parse_probe_asn function in utils correctly

ooni · Jan 22, 2025 · 7167486 · 7167486
1 parent 9d0c56f
commit 7167486
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ooniapi/services/oonimeasurements/src/oonimeasurements/routers/data/utils.py b/ooniapi/services/oonimeasurements/src/oonimeasurements/routers/data/utils.py
@@ -54,7 +54,7 @@ def test_name_to_group(tn):
     return ""
 
 
-def parse_probe_asn(probe_asn):
+def parse_probe_asn(probe_asn: Union[str, int]) -> int:
     if probe_asn.startswith("AS"):
         probe_asn = probe_asn[2:]
     if isinstance(probe_asn, str):

diff --git a/ooniapi/services/oonimeasurements/tests/test_oonidata_aggregate_observations.py b/ooniapi/services/oonimeasurements/tests/test_oonidata_aggregate_observations.py
@@ -28,6 +28,7 @@ def test_oonidata_aggregation_observations_with_since_and_until(client, params_s
     [
         ("probe_cc", "IT"),
         ("probe_asn", 45758),
+        ("probe_asn", [45758, 5650]),
         ("test_name", "whatsapp"),
         ("hostname", "www.on-instant.com"),
         ("ip", "64.233.190.139"),
@@ -43,7 +44,10 @@ def test_oonidata_aggregation_observations_with_filters(client, filter_name, fil
     assert isinstance(json["results"], list), json
     assert len(json["results"]) > 0
     for result in json["results"]:
-        assert result[filter_name] == filter_value, result
+        if isinstance(filter_value, list):
+            assert result[filter_name] in filter_value, result
+        else:
+            assert result[filter_name] == filter_value, result
 
 
 @pytest.mark.parametrize(