Conversation
add these services to docker-compose.yml
FIXME: parametize this
diff --git a/tests/integration/tests/conftest.py b/tests/integration/tests/conftest.py index 36b7ca6..8ca007e 100644 --- a/tests/integration/tests/conftest.py +++ b/tests/integration/tests/conftest.py @@ -98,7 +98,7 @@ def params_since_and_until_with_two_days(): @pytest.fixture def params_since_and_until_with_ten_days(): - return set_since_and_until_params(since="2026-01-01", until="2026-01-02") + return set_since_and_until_params(since="2026-01-01", until="2026-01-10") def set_since_and_until_params(since, until): diff --git a/tests/integration/tests/test_oonidata_aggregate_analysis.py b/tests/integration/tests/test_oonidata_aggregate_analysis.py index 23762bd..6bad311 100644 --- a/tests/integration/tests/test_oonidata_aggregate_analysis.py +++ b/tests/integration/tests/test_oonidata_aggregate_analysis.py @@ -3,7 +3,7 @@ import os route = "/api/v1/aggregation/analysis" since = "2026-01-01" -until = "2026-01-02" +until = "2026-01-10" def test_oonidata_aggregation_analysis(client): diff --git a/tests/integration/tests/test_oonidata_list_analysis.py b/tests/integration/tests/test_oonidata_list_analysis.py index 1be6fce..64af92e 100644 --- a/tests/integration/tests/test_oonidata_list_analysis.py +++ b/tests/integration/tests/test_oonidata_list_analysis.py @@ -2,7 +2,7 @@ import pytest route = "/api/v1/analysis" since = "2026-01-01" -until = "2026-01-02" +until = "2026-01-10" def test_oonidata_list_analysis(client):
--- a/tests/integration/docker-compose.yml
+++ b/tests/integration/docker-compose.yml
@@ -57,7 +57,7 @@ services:
environment:
CLICKHOUSE_URL: "http://testuser:testuser@clickhouse:9000/ooni"
command: >
- bash -c "./run_fastpath --debug --clickhouse-url $CLICKHOUSE_URL --stdout"
+ bash -c "./run_fastpath --debug --clickhouse-url $CLICKHOUSE_URL --keep-s3-cache --write-to-disk --stdout --start-day 2026-01-01 --end-day 2026-01-10 --noapi"
depends_on:
clickhouse:
condition: service_healthy
This reverts commit bab0dfd.
This reverts commit ca9155f. Try to use docker directly again and obtain debug logging
fastpath doesn't seem to injest these from disk and this seems to create a double dependency of the downloader service, so it gets invoked twice
variable expansion works slightly differently in docker compose than podman compose; so the CLICKHOSUE_URL was not being expanded correctly
aagbsn
force-pushed
the
add_end_to_end_tests
branch
from
e4092e4 to
3cf400e
Compare
This reverts commit eb52b75.
this can be brought up independently with its dependencies clickhouse by docker compose up fastpath2
aagbsn
force-pushed
the
add_end_to_end_tests
branch
from
2ef34e1 to
6d94632
Compare
aagbsn
force-pushed
the
add_end_to_end_tests
branch
from
ba5f89a to
2abfea4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.