Skip to content
Open
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
5 changes: 3 additions & 2 deletions src/h2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,11 @@ def __delitem__(self, key: SettingCodes | int) -> None:
del self._settings[key]

def __iter__(self) -> Iterator[SettingCodes | int]:
return self._settings.__iter__()
# New settings have no current value until their first acknowledgement.
return (key for key, values in self._settings.items() if values[0] is not None)

def __len__(self) -> int:
return len(self._settings)
return sum(1 for _ in self)

def __eq__(self, other: object) -> bool:
if isinstance(other, Settings):
Expand Down
51 changes: 51 additions & 0 deletions tests/test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,57 @@ def test_single_values_arent_affected_by_acknowledgement(self) -> None:
s.acknowledge()
assert s[h2.settings.SettingCodes.HEADER_TABLE_SIZE] == 4096

@pytest.mark.parametrize("setting", [80, h2.settings.SettingCodes.MAX_CONCURRENT_STREAMS])
def test_new_setting_mapping_waits_for_acknowledgement(self, setting: int) -> None:
"""Pending new settings are absent from every view of the active mapping."""
settings = h2.settings.Settings()
original = dict(settings)
settings[setting] = 100

assert dict(settings) == original
assert dict(settings.items()) == original
assert list(settings.values()) == list(original.values())
assert list(settings) == list(original)
assert len(settings) == len(original)
assert setting not in settings

changes = settings.acknowledge()

assert changes[setting].original_value is None
assert dict(settings) == {**original, setting: 100}
assert len(settings) == len(original) + 1
assert setting in settings

def test_new_setting_mapping_with_multiple_proposals(self) -> None:
"""A new key becomes visible on its first ACK and keeps later values pending."""
settings = h2.settings.Settings()
original = dict(settings)
settings[80] = 81
settings[80] = 82

assert dict(settings) == original
assert len(settings) == len(original)

settings.acknowledge()
assert dict(settings) == {**original, 80: 81}
assert len(settings) == len(original) + 1

settings.acknowledge()
assert dict(settings) == {**original, 80: 82}
assert len(settings) == len(original) + 1

def test_delete_pending_setting(self) -> None:
"""Deleting an unacknowledged key discards its proposed value."""
settings = h2.settings.Settings()
original = dict(settings)
settings[80] = 81

del settings[80]

assert dict(settings) == original
assert len(settings) == len(original)
assert settings.acknowledge() == {}

def test_settings_getters(self) -> None:
"""
Getters exist for well-known settings.
Expand Down