Move fixtures to conftest; root fixtures dir to THIS_DIR

ooniapi/services/oonirun/tests/conftest.py

@@ -1,16 +1,23 @@
 import pathlib
+from pathlib import Path
 import pytest
+import json
+import random
+from datetime import datetime, timedelta, UTC
 
 import time
 import jwt
 
 from fastapi.testclient import TestClient
 
 from oonirun.common.config import Settings
+from oonirun.common.clickhouse_utils import insert_click
 from oonirun.common.dependencies import get_settings
 from oonirun.main import app
 from clickhouse_driver import Client as ClickhouseClient
 
+THIS_DIR = Path(__file__).parent.resolve()
+
 
 def make_override_get_settings(**kw):
     def override_get_settings():
@@ -120,3 +127,70 @@ def clickhouse_server(docker_ip, docker_services):
 @pytest.fixture(scope="session")
 def clickhouse_db(clickhouse_server):
     yield ClickhouseClient.from_url(clickhouse_server)
+
+
+@pytest.fixture(scope="module")
+def fixtures_data_dir():
+    yield Path(THIS_DIR, "fixtures/data")
+
+
+@pytest.fixture(scope="module")
+def url_priorities(clickhouse_db, fixtures_data_dir):
+    filename = "url_priorities_us.json"
+    file = Path(fixtures_data_dir, filename)
+
+    with file.open("r") as f:
+        j = json.load(f)
+
+    # 'sign' is created with default value 0, causing a db error.
+    # use 1 to prevent it
+    for row in j:
+        row["sign"] = 1
+
+    query = "INSERT INTO url_priorities (sign, category_code, cc, domain, url, priority) VALUES"
+    insert_click(clickhouse_db, query, j)
+    yield
+    clickhouse_db.execute("TRUNCATE TABLE url_priorities")
+
+
+def generate_random_date_last_7_days() -> datetime:
+    start = datetime.now(tz=UTC) - timedelta(days=7)
+
+    # return a random date between 7 days ago and now
+    return start + timedelta(
+        seconds=random.randrange(3600 * 24, 3600 * 24 * 7 - 3600 * 24)
+    )
+
+
+@pytest.fixture(scope="module")
+def measurements(clickhouse_db, fixtures_data_dir):
+    msmnts_dir = Path(fixtures_data_dir, "measurements.json")
+    with open(msmnts_dir, "r") as f:
+        measurements = json.load(f)
+
+    for ms in measurements:
+        date = generate_random_date_last_7_days()
+        ms["measurement_start_time"] = date
+        ms["test_start_time"] = date
+
+    query = "INSERT INTO fastpath VALUES"
+    insert_click(clickhouse_db, query, measurements)
+
+    yield
+    clickhouse_db.execute("TRUNCATE TABLE url_priorities")
+
+
+@pytest.fixture
+def super_prioritized_website(clickhouse_db):
+    values = {
+        "category_code": "*",
+        "cc": "*",
+        "domain": "ooni.org",
+        "priority": 99999,
+        "url": "*",
+        "sign": 1,
+    }
+    query = "INSERT INTO url_priorities (sign, category_code, cc, domain, url, priority) VALUES"
+    insert_click(clickhouse_db, query, [values])
+    yield
+    clickhouse_db.execute("DELETE FROM url_priorities WHERE domain='ooni.org'")

ooniapi/services/oonirun/tests/integ/test_dynamic_lists.py

@@ -1,11 +1,7 @@
 from copy import deepcopy
-import json
-from pathlib import Path
 from oonirun.common.clickhouse_utils import insert_click
 import pytest
 from ..test_oonirun import SAMPLE_OONIRUN, SAMPLE_META
-from datetime import datetime, timedelta, UTC
-import random
 
 
 def postj(client, url, **kw):
@@ -14,57 +10,6 @@ def postj(client, url, **kw):
     return response.json()
 
 
-@pytest.fixture(scope="module")
-def fixtures_data_dir():
-    yield Path("tests/fixtures/data")
-
-
-@pytest.fixture(scope="module")
-def url_priorities(clickhouse_db, fixtures_data_dir):
-    filename = "url_priorities_us.json"
-    file = Path(fixtures_data_dir, filename)
-
-    with file.open("r") as f:
-        j = json.load(f)
-
-    # 'sign' is created with default value 0, causing a db error.
-    # use 1 to prevent it
-    for row in j:
-        row["sign"] = 1
-
-    query = "INSERT INTO url_priorities (sign, category_code, cc, domain, url, priority) VALUES"
-    insert_click(clickhouse_db, query, j)
-    yield
-    clickhouse_db.execute("TRUNCATE TABLE url_priorities")
-
-
-def generate_random_date_last_7_days() -> datetime:
-    start = datetime.now(tz=UTC) - timedelta(days=7)
-
-    # return a random date between 7 days ago and now
-    return start + timedelta(
-        seconds=random.randrange(3600 * 24, 3600 * 24 * 7 - 3600 * 24)
-    )
-
-
-@pytest.fixture(scope="module")
-def measurements(clickhouse_db, fixtures_data_dir):
-    msmnts_dir = Path(fixtures_data_dir, "measurements.json")
-    with open(msmnts_dir, "r") as f:
-        measurements = json.load(f)
-
-    for ms in measurements:
-        date = generate_random_date_last_7_days()
-        ms["measurement_start_time"] = date
-        ms["test_start_time"] = date
-
-    query = "INSERT INTO fastpath VALUES"
-    insert_click(clickhouse_db, query, measurements)
-
-    yield
-    clickhouse_db.execute("TRUNCATE TABLE url_priorities")
-
-
 def test_engine_descriptor_basic(client, client_with_user_role, url_priorities):
     z = deepcopy(SAMPLE_OONIRUN)
     z["name"] = "Testing simple prioritizationpri"
@@ -160,22 +105,6 @@ def test_prioritization_with_measurements(
     assert "facebook.com" in inputs[-1], "Facebook should be the last one"
 
 
-@pytest.fixture
-def super_prioritized_website(clickhouse_db):
-    values = {
-        "category_code": "*",
-        "cc": "*",
-        "domain": "ooni.org",
-        "priority": 99999,
-        "url": "*",
-        "sign": 1,
-    }
-    query = "INSERT INTO url_priorities (sign, category_code, cc, domain, url, priority) VALUES"
-    insert_click(clickhouse_db, query, [values])
-    yield
-    clickhouse_db.execute("DELETE FROM url_priorities WHERE domain='ooni.org'")
-
-
 def test_priorities_basic(
     client,
     client_with_user_role,

ooniapi/services/oonirun/tests/test_oonirun.py

@@ -836,10 +836,7 @@ def test_dynamic_test_lists_calculation(client_with_user_role):
     j = r.json()
     assert j["nettests"][0]["targets_name"] == "websites_list_prioritized"
 
-    # TODO(luis) Finish this test
 
-
-# TODO(luis) finish this test for checking the parsing of user agent headers
 def test_x_user_agent_header_parsing(client_with_user_role, client):
     z = deepcopy(SAMPLE_OONIRUN)
     z["name"] = "Testing header parsing"