Skip to content

test: do not expect /usr/share/pixmaps/debian-logo.png to exist #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
missytake merged 1 commit into from
Jul 22, 2026
Merged

test: do not expect /usr/share/pixmaps/debian-logo.png to exist #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added tests/avatar.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 10 additions & 12 deletions tests/test_bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import os.path
from pathlib import Path

import pytest
from deltachat_rpc_client import EventType
Expand All @@ -23,6 +23,11 @@
"""


@pytest.fixture()
def avatar_filename() -> str:
return str(Path(__file__).parent / "avatar.png")


def join_chat(user, invite, log):
user.secure_join(invite)
user.wait_for_securejoin_joiner_success()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading