From a04ac5b8657b747515bdd10ed17dee2a2ecccfc8 Mon Sep 17 00:00:00 2001 From: link2xt Date: Sat, 18 Jul 2026 12:09:14 +0000 Subject: [PATCH] test: do not expect /usr/share/pixmaps/debian-logo.png to exist Otherwise the tests are skipped on non-Debian systems. --- tests/avatar.png | Bin 0 -> 3261 bytes tests/test_bot.py | 22 ++++++++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 tests/avatar.png diff --git a/tests/avatar.png b/tests/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..da0a5a161d8bd7402826ac96e7f310e0e3f1d60a GIT binary patch literal 3261 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 vdPgq(FytN str: + return str(Path(__file__).parent / "avatar.png") + + def join_chat(user, invite, log): user.secure_join(invite) user.wait_for_securejoin_joiner_success() @@ -168,7 +173,7 @@ def test_add_outsider_to_relay_group(relay_group, bot, outsider, log): @pytest.mark.timeout(TIMEOUT) -def test_relay_outside_1on1_chats(crew, bot, crew_member, outsider, log): +def test_relay_outside_1on1_chats(crew, bot, crew_member, outsider, log, avatar_filename): log.step("send message to bot") bot_invite = bot.account.get_qr_code() outsider_outside_chat = join_chat(outsider, bot_invite, log) @@ -231,10 +236,7 @@ def test_relay_outside_1on1_chats(crew, bot, crew_member, outsider, log): assert user_mute_success.text == "Ignoring chat in the future." log.step("outsider sets avatar") - example_png_path = "/usr/share/pixmaps/debian-logo.png" - if not os.path.exists(example_png_path): - pytest.skip(f"example image not available: {example_png_path}") - outsider.set_avatar(example_png_path) + outsider.set_avatar(avatar_filename) log.step("reply with outsider") outsider_outside_chat.send_text("Second message by outsider") @@ -467,7 +469,7 @@ def test_changed_outside_help(crew, bot, crew_member, outsider, log): @pytest.mark.timeout(TIMEOUT) -def test_change_avatar(crew, bot, crew_member, log): +def test_change_avatar(crew, bot, crew_member, log, avatar_filename): for contact in crew_member.get_contacts(): if contact.get_snapshot().address == bot.account.get_config("addr"): botcontact = contact @@ -476,12 +478,8 @@ def test_change_avatar(crew, bot, crew_member, log): else: pytest.fail("bot contact not found") - example_png_path = "/usr/share/pixmaps/debian-logo.png" - if not os.path.exists(example_png_path): - pytest.skip(f"example image not available: {example_png_path}") - log.step("set avatar to example image") - crew.chat.send_message(text="/set_avatar", file=example_png_path) + crew.chat.send_message(text="/set_avatar", file=avatar_filename) bot._process_events(until_event=EventType.INCOMING_MSG) group_avatar_changed_msg = crew_member.wait_for_incoming_msg().get_snapshot() assert "Group image changed" in group_avatar_changed_msg.text