Skip to content
Merged
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
15 changes: 13 additions & 2 deletions tests/client/core/test_delta.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import logging
import threading
import time
import warnings

import pyarrow as pa
Expand All @@ -18,9 +19,9 @@
from mp_api.client.core.exceptions import MPRestError, MPRestWarning

REAL_ERROR = (
"Failed to fetch metadata for file Users/tsmathis/mp_datasets/build/collections/"
"Failed to fetch metadata for file data/mp_datasets/build/collections/"
"materials/version=2026-04-13/group-4-part-0.zstd.parquet: Parquet error: External: "
"Object at location /Users/tsmathis/mp_datasets/build/collections/materials/"
"Object at location /data/mp_datasets/build/collections/materials/"
"version=2026-04-13/group-4-part-0.zstd.parquet not found: No such file or "
"directory (os error 2)"
)
Expand Down Expand Up @@ -344,6 +345,13 @@ def target():
return th, result


def _wait_until(predicate, timeout=5.0):
deadline = time.monotonic() + timeout
while not predicate():
assert time.monotonic() < deadline, "test timed out"
time.sleep(0.005)


def test_reload_does_not_block_queries_on_other_tables(catalog, monkeypatch):
blocker = BlockingLoads(monkeypatch, "s3a://bucket/a/")

Expand Down Expand Up @@ -386,6 +394,9 @@ def test_concurrent_refreshes_of_same_table_reload_once(catalog, monkeypatch):
t1, r1 = _in_thread(catalog.execute, "SELECT * FROM a", label="a")
assert blocker.started.wait(5)
t2, r2 = _in_thread(catalog.execute, "SELECT * FROM a", label="a")
# t2 must take the second failure before t1's reload finishes; otherwise
# t1's retry takes it and fails
_wait_until(lambda: not FakeQueryBuilder.failures)

blocker.release.set()
t1.join(5)
Expand Down
2 changes: 2 additions & 0 deletions tests/client/test_mprester.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
from mp_api.client.core import MPRestError, MPRestWarning
from mp_api.client.core.settings import _DEFAULT_ENDPOINT
from mp_api.client.routes.materials.thermo import ThermoRester
from mp_api.client.core._entries import mixing_scheme_class

try:
from mp_api.client.contribs import ContribsClient as contribs_client
Expand Down Expand Up @@ -491,6 +492,7 @@ def test_get_phase_diagram_without_gnome_matches_remix(self, mpr, monkeypatch):
)
pd = mpr.materials.thermo.get_phase_diagram_from_chemsys(chemsys)
unmixed = mpr._get_unmixed_entries(_all_subchemsyses(chemsys.split("-")))
MaterialsProjectDFTMixingScheme = mixing_scheme_class()
remixed = PhaseDiagram(
MaterialsProjectDFTMixingScheme().process_entries(
[e for e in unmixed if e.data.get("license") != "BY-NC"]
Expand Down
Loading