Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test:
@# Note that extensive integration tests are also run in the bundle repo,
@# for both aw-server and aw-server-rust, but without code coverage.
python -c 'import aw_server'
python -m pytest tests/test_server.py tests/test_profile.py tests/test_profile_config.py tests/test_query_cache.py tests/test_import.py tests/test_host_header.py tests/test_database_concurrency.py tests/test_settings.py
python -m pytest tests/test_server.py tests/test_profile.py tests/test_profile_config.py tests/test_query_cache.py tests/test_import.py tests/test_host_header.py tests/test_database_concurrency.py tests/test_settings.py tests/test_long_event_overlap.py

typecheck:
python -m mypy aw_server tests --ignore-missing-imports
Expand Down
103 changes: 103 additions & 0 deletions tests/test_long_event_overlap.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
"""REST, CSV and AQL must include accepted long events with Peewee storage.

Requires an aw-core containing the repair for ActivityWatch/aw-core#194.
"""

import csv
import io
from functools import partial

import pytest
from aw_datastore.storages import PeeweeStorage

from aw_server.server import AWFlask

ROUTE = "/api/0/buckets/long-events"
START = "2026-10-02T12:00:00+00:00"
END = "2026-10-02T13:00:00+00:00"
BOUNDS = {"start": START, "end": END}


@pytest.fixture()
def long_client(tmp_path, monkeypatch):
monkeypatch.setattr(
"aw_datastore.storages.peewee.get_data_dir", lambda _: str(tmp_path)
)
app = AWFlask(
"127.0.0.1",
testing=True,
storage_method=partial(PeeweeStorage, filepath=str(tmp_path / "events.db")),
query_cache=False,
)
client = app.test_client()
assert (
client.post(
ROUTE, json={"type": "test", "client": "test", "hostname": "test"}
).status_code
== 200
)
assert (
client.post(
ROUTE + "/events",
json={
"timestamp": "2026-10-01T00:00:00Z",
"duration": 172800,
"data": {"label": "long"},
},
).status_code
== 200
)
try:
yield client
finally:
app.api.db.storage_strategy.db.close()


def test_bounded_get_and_count_include_long_event(long_client):
unbounded = long_client.get(ROUTE + "/events").get_json()
assert len(unbounded) == 1
assert unbounded[0]["duration"] == 172800
response = long_client.get(ROUTE + "/events", query_string=BOUNDS)
assert response.status_code == 200
events = response.get_json()
assert len(events) == 1
assert events[0] == dict(unbounded[0], timestamp=START, duration=3600.0)
response = long_client.get(ROUTE + "/events/count", query_string=BOUNDS)
assert response.status_code == 200
assert response.get_json() == 1
assert long_client.get(ROUTE + "/events").get_json() == unbounded


def test_bounded_csv_contains_long_event_row(long_client):
unbounded = long_client.get(ROUTE + "/events").get_json()
assert len(unbounded) == 1
assert unbounded[0]["duration"] == 172800
response = long_client.get(ROUTE + "/export/csv", query_string=BOUNDS)
assert response.status_code == 200
rows = list(csv.DictReader(io.StringIO(response.get_data(as_text=True))))
assert len(rows) == 1
assert rows[0]["label"] == "long"
assert rows[0]["timestamp"] == START
assert float(rows[0]["duration"]) == 3600
assert long_client.get(ROUTE + "/events").get_json() == unbounded


@pytest.mark.parametrize(
"query,expected",
[
('RETURN = sum_durations(query_bucket("long-events"));', 3600.0),
('RETURN = query_bucket_eventcount("long-events");', 1),
],
)
def test_bounded_aql_includes_long_event(long_client, query, expected):
unbounded = long_client.get(ROUTE + "/events").get_json()
assert len(unbounded) == 1
assert unbounded[0]["duration"] == 172800
response = long_client.post(
"/api/0/query/",
json={"query": [query], "timeperiods": [START + "/" + END], "cache": False},
)
assert response.status_code == 200
# Preserve Peewee's existing clipping semantics; do not sum the full 48h.
assert response.get_json() == [expected]
Comment thread
TimeToBuildBob marked this conversation as resolved.
Resolved
assert long_client.get(ROUTE + "/events").get_json() == unbounded
Loading