summaryrefslogtreecommitdiffstats
path: root/packages/meshbay-node/tests/test_transfer_settings.py
diff options
context:
space:
mode:
authorChristophe Besson <cbesson@gmail.com>2026-09-19 14:01:38 +0200
committerChristophe Besson <cbesson@gmail.com>2026-09-19 14:01:38 +0200
commitd2495a2c4b89fbbfc18cefec83ae96cabdd745e2 (patch)
tree463e4d11b1c742475aac07155818c9c64a1e43e5 /packages/meshbay-node/tests/test_transfer_settings.py
parentf8223293a211a87c92b1fed80f5ca53660f6b26c (diff)
parent933daccbcfde7705413d3a10db87d910c650ed42 (diff)
downloadmeshbay-d2495a2c4b89fbbfc18cefec83ae96cabdd745e2.tar.gz
Merge origin/main: the operator's upload ceiling beside the disk-thread work
One conflict, in §15.3's open list, and it was two changes agreeing rather than disagreeing: this side removed the rows for the third-party search bound and the node-announcement bound because both are now built (AV27, AV28), while the other side kept them and added a new one. Resolved by keeping what is genuinely still open — per-device revocation having no CLI — and leaving the two closed. `webrtc_server.py` merged without conflict but the two sides met inside one function: `_upload_chunk` gained the operator's `max_upload_gb` ceiling from there and the per-group lock and `off_disk` calls from here. Read back rather than trusted: the operator's ceiling now sits inside the critical section that keeps chunk ordering, and the unlink beside it goes to the disk thread with everything else. 2893 passed. The twelve `test_sticky_header.py[firefox]` setup errors are the open Firefox on this machine, as before.
Diffstat (limited to 'packages/meshbay-node/tests/test_transfer_settings.py')
-rw-r--r--packages/meshbay-node/tests/test_transfer_settings.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/meshbay-node/tests/test_transfer_settings.py b/packages/meshbay-node/tests/test_transfer_settings.py
index aa24782..bcfa6a8 100644
--- a/packages/meshbay-node/tests/test_transfer_settings.py
+++ b/packages/meshbay-node/tests/test_transfer_settings.py
@@ -139,15 +139,17 @@ async def test_the_node_wide_caps_round_trip_through_the_roster(roster):
**{k: None for k in ("invite_ttl_hours", "pair_ttl_hours",
"device_request_ttl_minutes",
"max_concurrent_streams",
- "transcode_incompatible_video")},
+ "transcode_incompatible_video",
+ "max_upload_gb")},
"stun_servers": [], "ice_interfaces": [],
}
await roster.set_node_setting(roster.SETTING_MAX_DOWNLOADS, "3", "op")
assert (await roster.node_settings(defaults))["max_concurrent_downloads"] == 3
-def test_node_toml_carries_both_keys():
+def test_node_toml_carries_the_upload_keys():
"""The template is what an operator reads before they read any document."""
from meshbay_node.config import EXAMPLE_CONFIG as tpl
assert "max_concurrent_downloads" in tpl
assert "max_concurrent_uploads" in tpl
+ assert "max_upload_gb" in tpl