Skip to content

in test_settings, add clickhouse_server fixture #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

in test_settings, add clickhouse_server fixture #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8bfc11
in test_settings, add clickhouse_server fixture
aagbsn Oct 29, 2025
13dcbf7
delay and decrease probe frequency of is_clickhouse_running to reduce…
aagbsn Oct 30, 2025
f1cbfc7
remove docker_ip and docker_services included by clickhouse_server
aagbsn Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ooniapi/services/oonimeasurements/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ def maybe_download_fixtures():


def is_clickhouse_running(url):
# using ClickhouseClient as probe spams WARN messages with logger in clickhouse_driver
time.sleep(2)
try:
with ClickhouseClient.from_url(url) as client:
client.execute("SELECT 1")
Expand All @@ -53,7 +55,7 @@ def clickhouse_server(maybe_download_fixtures, docker_ip, docker_services):
port = docker_services.port_for("clickhouse", 9000)
url = "clickhouse://test:test@{}:{}".format(docker_ip, port)
docker_services.wait_until_responsive(
timeout=30.0, pause=0.1, check=lambda: is_clickhouse_running(url)
timeout=30.0, pause=1.0, check=lambda: is_clickhouse_running(url)
)
yield url

Expand Down
10 changes: 6 additions & 4 deletions ooniapi/services/ooniprobe/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pytest
import shutil
import os
import time
from urllib.request import urlopen

from fastapi.testclient import TestClient
Expand Down Expand Up @@ -107,13 +108,12 @@ def client(clickhouse_server, test_settings, geoip_db_dir):


@pytest.fixture
def test_settings(alembic_migration, docker_ip, docker_services, geoip_db_dir, fastpath_server):
port = docker_services.port_for("clickhouse", 9000)
def test_settings(alembic_migration, geoip_db_dir, clickhouse_server, fastpath_server):
yield make_override_get_settings(
postgresql_url=alembic_migration,
jwt_encryption_key=JWT_ENCRYPTION_KEY,
prometheus_metrics_password="super_secure",
clickhouse_url=f"clickhouse://test:test@{docker_ip}:{port}",
clickhouse_url=clickhouse_server,
geoip_db_dir=geoip_db_dir,
collector_id="1",
fastpath_url=fastpath_server
Expand All @@ -126,6 +126,8 @@ def jwt_encryption_key():


def is_clickhouse_running(url):
# using ClickhouseClient as probe spams WARN messages with logger in clickhouse_driver
time.sleep(2)
try:
with ClickhouseClient.from_url(url) as client:
client.execute("SELECT 1")
Expand All @@ -140,7 +142,7 @@ def clickhouse_server(docker_ip, docker_services):
# See password in docker compose
url = "clickhouse://test:test@{}:{}".format(docker_ip, port)
docker_services.wait_until_responsive(
timeout=30.0, pause=0.1, check=lambda: is_clickhouse_running(url)
timeout=30.0, pause=1.0, check=lambda: is_clickhouse_running(url)
)
yield url

Expand Down
Loading