All checks were successful
Zapret source guards / validate (push) Successful in 8s
На странице «Серверы» новый переключатель «Делиться обновлениями через интернет». Он выключен, пока человек сам не включит: роутер открывает порт, а IP-адрес виден тем, кто соединится. Что делает: - раздаёт файлы своей версии по TLS, открывает порт на роутере (UPnP), записывается на сервере очереди (когда тот включит книгу) и держит свою книгу соседей; - берёт файлы у копий в интернете только если серверы обновлений их не отдали: пока серверы живы, адрес человека соседям по интернету не показывается; в этом случае просится и то, что сервер прислал бы маленькой заплаткой; - записывается и спрашивает у всех известных серверов (основной и зеркала); - выключатель раздачи по сети отключает вопрос соседям по сети, а раздача по интернету не зависит от него. Шаг экскурсии, тексты ru/en, настройка program.share_updates_internet. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
354 lines
13 KiB
Python
354 lines
13 KiB
Python
from __future__ import annotations
|
|
|
|
import unittest
|
|
|
|
from PyQt6.QtCore import QEvent, Qt
|
|
from PyQt6.QtGui import QKeyEvent
|
|
|
|
from updater.ui import settings_build
|
|
from updater.ui.settings_build import build_servers_settings_section
|
|
|
|
|
|
class _FakeSignal:
|
|
def connect(self, callback):
|
|
self.callback = callback
|
|
|
|
def emit(self):
|
|
callback = getattr(self, "callback", None)
|
|
if callback is not None:
|
|
callback()
|
|
|
|
|
|
class _FakeToggleRow:
|
|
def __init__(self, *args):
|
|
self.args = args
|
|
self.toggled = _FakeSignal()
|
|
self._accessible_name = ""
|
|
self._accessible_description = ""
|
|
self.properties = {}
|
|
|
|
def setChecked(self, value, *, block_signals=False): # noqa: N802
|
|
self.checked = bool(value)
|
|
self.block_signals = bool(block_signals)
|
|
|
|
def accessibleName(self): # noqa: N802
|
|
return self._accessible_name
|
|
|
|
def setAccessibleName(self, value): # noqa: N802
|
|
self._accessible_name = value
|
|
|
|
def accessibleDescription(self): # noqa: N802
|
|
return self._accessible_description
|
|
|
|
def setAccessibleDescription(self, value): # noqa: N802
|
|
self._accessible_description = value
|
|
|
|
def property(self, name):
|
|
return self.properties.get(name)
|
|
|
|
def setProperty(self, name, value): # noqa: N802
|
|
self.properties[name] = value
|
|
|
|
|
|
class _FakeSettingsGroup:
|
|
def __init__(self, title, parent):
|
|
self.title = title
|
|
self.parent = parent
|
|
self.rows = []
|
|
|
|
def addSettingCard(self, row): # noqa: N802
|
|
self.rows.append(row)
|
|
|
|
|
|
class _FakeCard:
|
|
def add_layout(self, layout):
|
|
self.layout = layout
|
|
|
|
|
|
class _FakeButton:
|
|
def __init__(self):
|
|
self.text = ""
|
|
self._accessible_name = ""
|
|
self._accessible_description = ""
|
|
self.properties = {}
|
|
|
|
def setText(self, text): # noqa: N802
|
|
self.text = text
|
|
|
|
def setAccessibleName(self, value): # noqa: N802
|
|
self._accessible_name = value
|
|
|
|
def accessibleName(self): # noqa: N802
|
|
return self._accessible_name
|
|
|
|
def setAccessibleDescription(self, value): # noqa: N802
|
|
self._accessible_description = value
|
|
|
|
def accessibleDescription(self): # noqa: N802
|
|
return self._accessible_description
|
|
|
|
def setProperty(self, name, value): # noqa: N802
|
|
self.properties[name] = value
|
|
|
|
def property(self, name):
|
|
return self.properties.get(name)
|
|
|
|
|
|
class _FakePushSettingCard:
|
|
def __init__(self, action_text, icon, title, content):
|
|
self.action_text = action_text
|
|
self.icon = icon
|
|
self.title = title
|
|
self.content = content
|
|
self.button = _FakeButton()
|
|
self.clicked = _FakeSignal()
|
|
self._accessible_name = ""
|
|
self._accessible_description = ""
|
|
self.properties = {}
|
|
self._focus_policy = Qt.FocusPolicy.NoFocus
|
|
|
|
def setAccessibleName(self, value): # noqa: N802
|
|
self._accessible_name = value
|
|
|
|
def accessibleName(self): # noqa: N802
|
|
return self._accessible_name
|
|
|
|
def setAccessibleDescription(self, value): # noqa: N802
|
|
self._accessible_description = value
|
|
|
|
def accessibleDescription(self): # noqa: N802
|
|
return self._accessible_description
|
|
|
|
def setProperty(self, name, value): # noqa: N802
|
|
self.properties[name] = value
|
|
|
|
def property(self, name):
|
|
return self.properties.get(name)
|
|
|
|
def focusPolicy(self): # noqa: N802
|
|
return self._focus_policy
|
|
|
|
def setFocusPolicy(self, value): # noqa: N802
|
|
self._focus_policy = value
|
|
|
|
def keyPressEvent(self, _event): # noqa: N802
|
|
pass
|
|
|
|
|
|
class _FakeLabel:
|
|
def __init__(self, text):
|
|
self.text = text
|
|
self._accessible_name = ""
|
|
self.properties = {}
|
|
|
|
def setAccessibleName(self, value): # noqa: N802
|
|
self._accessible_name = value
|
|
|
|
def accessibleName(self): # noqa: N802
|
|
return self._accessible_name
|
|
|
|
def setProperty(self, name, value): # noqa: N802
|
|
self.properties[name] = value
|
|
|
|
def property(self, name):
|
|
return self.properties.get(name)
|
|
|
|
|
|
class _FakeLayout:
|
|
def setContentsMargins(self, *args): # noqa: N802
|
|
self.margins = args
|
|
|
|
def setSpacing(self, value): # noqa: N802
|
|
self.spacing = value
|
|
|
|
def addWidget(self, widget): # noqa: N802
|
|
self.widget = widget
|
|
|
|
def addStretch(self): # noqa: N802
|
|
self.stretch = True
|
|
|
|
|
|
class UpdaterSettingsBuildTests(unittest.TestCase):
|
|
def test_version_label_is_not_added_as_full_settings_card(self) -> None:
|
|
widgets = build_servers_settings_section(
|
|
content_parent=object(),
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
auto_check_enabled=True,
|
|
app_version="21.0.0.142",
|
|
channel="dev",
|
|
setting_card_group_cls=_FakeSettingsGroup,
|
|
settings_card_cls=_FakeCard,
|
|
win11_toggle_row_cls=_FakeToggleRow,
|
|
caption_label_cls=_FakeLabel,
|
|
qhbox_layout_cls=_FakeLayout,
|
|
on_auto_check_toggled=lambda _value: None,
|
|
)
|
|
|
|
# Три строки: автообновление, раздача по сети и раздача через интернет; подпись версии — не карточка.
|
|
self.assertEqual(len(widgets.card.rows), 3)
|
|
self.assertIs(widgets.card.rows[0], widgets.auto_check_card)
|
|
self.assertIs(widgets.card.rows[1], widgets.share_lan_card)
|
|
self.assertIs(widgets.card.rows[2], widgets.share_internet_card)
|
|
self.assertEqual(widgets.version_info_label.text, "v21.0.0.142 · dev")
|
|
|
|
def test_share_lan_switch_starts_with_its_saved_value_and_reports_clicks(self) -> None:
|
|
clicks: list[bool] = []
|
|
widgets = build_servers_settings_section(
|
|
content_parent=object(),
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
auto_check_enabled=True,
|
|
app_version="21.0.0.142",
|
|
channel="dev",
|
|
setting_card_group_cls=_FakeSettingsGroup,
|
|
settings_card_cls=_FakeCard,
|
|
win11_toggle_row_cls=_FakeToggleRow,
|
|
caption_label_cls=_FakeLabel,
|
|
qhbox_layout_cls=_FakeLayout,
|
|
on_auto_check_toggled=lambda _value: None,
|
|
share_lan_enabled=False,
|
|
on_share_lan_toggled=clicks.append,
|
|
)
|
|
|
|
self.assertFalse(widgets.share_lan_card.checked)
|
|
widgets.share_lan_card.toggled.callback(True) # щелчок человека
|
|
self.assertEqual(clicks, [True])
|
|
self.assertIn("в моей сети", widgets.share_lan_card.accessibleName())
|
|
|
|
def test_share_internet_switch_is_off_by_default_and_reports_clicks(self) -> None:
|
|
clicks: list[bool] = []
|
|
kwargs = dict(
|
|
content_parent=object(), tr_fn=lambda _key, default: default, accent_hex="#22dddd",
|
|
auto_check_enabled=True, app_version="21.0.0.142", channel="dev",
|
|
setting_card_group_cls=_FakeSettingsGroup, settings_card_cls=_FakeCard,
|
|
win11_toggle_row_cls=_FakeToggleRow, caption_label_cls=_FakeLabel, qhbox_layout_cls=_FakeLayout,
|
|
on_auto_check_toggled=lambda _value: None,
|
|
)
|
|
widgets = build_servers_settings_section(**kwargs, on_share_internet_toggled=clicks.append)
|
|
self.assertFalse(widgets.share_internet_card.checked) # выключено, пока человек не включит
|
|
widgets.share_internet_card.toggled.callback(True)
|
|
self.assertEqual(clicks, [True])
|
|
self.assertIn("через интернет", widgets.share_internet_card.accessibleName())
|
|
self.assertIn("IP-адрес", widgets.share_internet_card.args[2]) # цена названа прямо в описании
|
|
on = build_servers_settings_section(**kwargs, share_internet_enabled=True)
|
|
self.assertTrue(on.share_internet_card.checked)
|
|
|
|
def test_version_label_exposes_screen_reader_state(self) -> None:
|
|
widgets = build_servers_settings_section(
|
|
content_parent=object(),
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
auto_check_enabled=False,
|
|
app_version="21.0.0.142",
|
|
channel="dev",
|
|
setting_card_group_cls=_FakeSettingsGroup,
|
|
settings_card_cls=_FakeCard,
|
|
win11_toggle_row_cls=_FakeToggleRow,
|
|
caption_label_cls=_FakeLabel,
|
|
qhbox_layout_cls=_FakeLayout,
|
|
on_auto_check_toggled=lambda _value: None,
|
|
)
|
|
|
|
self.assertEqual(widgets.version_info_label.accessibleName(), "Версия ZapretGUI: v21.0.0.142 · dev")
|
|
self.assertEqual(
|
|
widgets.version_info_label.property("screenReaderStateText"),
|
|
"Версия ZapretGUI: v21.0.0.142 · dev",
|
|
)
|
|
|
|
def test_auto_check_toggle_exposes_screen_reader_state(self) -> None:
|
|
enabled_widgets = build_servers_settings_section(
|
|
content_parent=object(),
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
auto_check_enabled=True,
|
|
app_version="21.0.0.142",
|
|
channel="dev",
|
|
setting_card_group_cls=_FakeSettingsGroup,
|
|
settings_card_cls=_FakeCard,
|
|
win11_toggle_row_cls=_FakeToggleRow,
|
|
caption_label_cls=_FakeLabel,
|
|
qhbox_layout_cls=_FakeLayout,
|
|
on_auto_check_toggled=lambda _value: None,
|
|
)
|
|
disabled_widgets = build_servers_settings_section(
|
|
content_parent=object(),
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
auto_check_enabled=False,
|
|
app_version="21.0.0.142",
|
|
channel="dev",
|
|
setting_card_group_cls=_FakeSettingsGroup,
|
|
settings_card_cls=_FakeCard,
|
|
win11_toggle_row_cls=_FakeToggleRow,
|
|
caption_label_cls=_FakeLabel,
|
|
qhbox_layout_cls=_FakeLayout,
|
|
on_auto_check_toggled=lambda _value: None,
|
|
)
|
|
|
|
self.assertEqual(
|
|
enabled_widgets.auto_check_card.accessibleName(),
|
|
"Обновлять программу автоматически, включено",
|
|
)
|
|
self.assertEqual(
|
|
enabled_widgets.auto_check_card.property("screenReaderStateText"),
|
|
"Обновлять программу автоматически, включено",
|
|
)
|
|
self.assertIn("скачивает новую версию", enabled_widgets.auto_check_card.accessibleDescription())
|
|
self.assertEqual(
|
|
disabled_widgets.auto_check_card.accessibleName(),
|
|
"Обновлять программу автоматически, выключено",
|
|
)
|
|
self.assertEqual(
|
|
disabled_widgets.auto_check_card.property("screenReaderStateText"),
|
|
"Обновлять программу автоматически, выключено",
|
|
)
|
|
|
|
def test_telegram_card_and_button_expose_screen_reader_action(self) -> None:
|
|
old_icon_factory = settings_build.get_themed_qta_icon
|
|
settings_build.get_themed_qta_icon = lambda *_args, **_kwargs: object()
|
|
self.addCleanup(setattr, settings_build, "get_themed_qta_icon", old_icon_factory)
|
|
|
|
widgets = settings_build.build_servers_telegram_section(
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
push_setting_card_cls=_FakePushSettingCard,
|
|
on_open_channel=lambda: None,
|
|
)
|
|
|
|
expected_name = "Открыть Telegram канал обновлений"
|
|
|
|
self.assertEqual(widgets.card.accessibleName(), expected_name)
|
|
self.assertEqual(widgets.card.property("screenReaderStateText"), expected_name)
|
|
self.assertIn("версии программы", widgets.card.accessibleDescription())
|
|
self.assertEqual(widgets.button.accessibleName(), expected_name)
|
|
self.assertEqual(widgets.button.property("screenReaderStateText"), expected_name)
|
|
self.assertIn("версии программы", widgets.button.accessibleDescription())
|
|
|
|
def test_telegram_card_opens_from_keyboard(self) -> None:
|
|
old_icon_factory = settings_build.get_themed_qta_icon
|
|
settings_build.get_themed_qta_icon = lambda *_args, **_kwargs: object()
|
|
self.addCleanup(setattr, settings_build, "get_themed_qta_icon", old_icon_factory)
|
|
opened: list[bool] = []
|
|
|
|
widgets = settings_build.build_servers_telegram_section(
|
|
tr_fn=lambda _key, default: default,
|
|
accent_hex="#22dddd",
|
|
push_setting_card_cls=_FakePushSettingCard,
|
|
on_open_channel=lambda: opened.append(True),
|
|
)
|
|
|
|
self.assertEqual(widgets.card.focusPolicy(), Qt.FocusPolicy.StrongFocus)
|
|
widgets.card.keyPressEvent(
|
|
QKeyEvent(
|
|
QEvent.Type.KeyPress,
|
|
Qt.Key.Key_Return,
|
|
Qt.KeyboardModifier.NoModifier,
|
|
)
|
|
)
|
|
|
|
self.assertEqual(opened, [True])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|