mirror of
https://github.com/chatmail/core.git
synced 2026-04-05 23:22:11 +03:00
2c4dbe6e68
This effectively reverts https://github.com/deltachat/deltachat-core-rust/pull/964 for chat.rs, which in that PR was thought to fix something. So maybe something is still broken? But after improving tests the previous code seems to be correct. - Update Python bindings to not always use dc_prepare_msg path when sending messages with attachements. When using dc_prepare_msg the blobs need to be created in the blobdir since they will not get copied and many tests where not doing this. - Add a test that ensures that calling dc_prepare_msg with a file **not** in the blobdir fails. - Add a test that ensures that calling dc_send_msg directly with a file **not** in the blobdir copies the file to the blobdir. This test cheats a little by knowing what the filename in the blobdir will be which is implementation-dependent and thus a bit brittle. But for now it proves correct behaviour so let's go with this. - Improve the test_forward_increation test to ensure that the in-creation file only has it's final state before calling dc_send_msg. This checks the correct file data is sent out and not the preparing data, this fails with the chat.rs changes in #964 (reverted here to make this work again). Also fix the test to actually create the in-creation file in the blobdir. - Fix test_send_file_twice_unicode_filename_mangling to not use in-creation. It was not creating it's files in the blobdir and that is an error when using in-creation and it didn't seem it was trying to test something about the in-creation logic (which is tested in test_increation.py already). - Fix Message._msgtate code which presumably was not used before? - Rename `BlobObject::create_from_path` to `BlobObject::new_from_path`. All the `BlobObject::create*` calls now always create new files which is much more consistent. APIs should do what is obious.
113 lines
4.6 KiB
Python
113 lines
4.6 KiB
Python
from __future__ import print_function
|
|
|
|
import os.path
|
|
import shutil
|
|
|
|
import pytest
|
|
from filecmp import cmp
|
|
|
|
from conftest import wait_configuration_progress, wait_msgs_changed
|
|
from deltachat import const
|
|
|
|
|
|
class TestOnlineInCreation:
|
|
def test_increation_not_blobdir(self, tmpdir, acfactory, lp):
|
|
ac1 = acfactory.get_online_configuring_account()
|
|
ac2 = acfactory.get_online_configuring_account()
|
|
wait_configuration_progress(ac1, 1000)
|
|
wait_configuration_progress(ac2, 1000)
|
|
|
|
c2 = ac1.create_contact(email=ac2.get_config("addr"))
|
|
chat = ac1.create_chat_by_contact(c2)
|
|
|
|
lp.sec("Creating in-creation file outside of blobdir")
|
|
assert tmpdir.strpath != ac1.get_blobdir()
|
|
src = tmpdir.join('file.txt').ensure(file=1)
|
|
with pytest.raises(Exception):
|
|
chat.prepare_message_file(src.strpath)
|
|
|
|
def test_no_increation_copies_to_blobdir(self, tmpdir, acfactory, lp):
|
|
ac1 = acfactory.get_online_configuring_account()
|
|
ac2 = acfactory.get_online_configuring_account()
|
|
wait_configuration_progress(ac1, 1000)
|
|
wait_configuration_progress(ac2, 1000)
|
|
|
|
c2 = ac1.create_contact(email=ac2.get_config("addr"))
|
|
chat = ac1.create_chat_by_contact(c2)
|
|
|
|
lp.sec("Creating file outside of blobdir")
|
|
assert tmpdir.strpath != ac1.get_blobdir()
|
|
src = tmpdir.join('file.txt')
|
|
src.write("hello there\n")
|
|
chat.send_file(src.strpath)
|
|
|
|
blob_src = os.path.join(ac1.get_blobdir(), 'file.txt')
|
|
assert os.path.exists(blob_src), "file.txt not copied to blobdir"
|
|
|
|
def test_forward_increation(self, acfactory, data, lp):
|
|
ac1 = acfactory.get_online_configuring_account()
|
|
ac2 = acfactory.get_online_configuring_account()
|
|
wait_configuration_progress(ac1, 1000)
|
|
wait_configuration_progress(ac2, 1000)
|
|
|
|
c2 = ac1.create_contact(email=ac2.get_config("addr"))
|
|
chat = ac1.create_chat_by_contact(c2)
|
|
assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
|
|
wait_msgs_changed(ac1, 0, 0) # why no chat id?
|
|
|
|
lp.sec("create a message with a file in creation")
|
|
orig = data.get_path("d.png")
|
|
path = os.path.join(ac1.get_blobdir(), 'd.png')
|
|
with open(path, "x") as fp:
|
|
fp.write("preparing")
|
|
prepared_original = chat.prepare_message_file(path)
|
|
assert prepared_original.is_out_preparing()
|
|
wait_msgs_changed(ac1, chat.id, prepared_original.id)
|
|
|
|
lp.sec("forward the message while still in creation")
|
|
chat2 = ac1.create_group_chat("newgroup")
|
|
chat2.add_contact(c2)
|
|
wait_msgs_changed(ac1, 0, 0) # why not chat id?
|
|
ac1.forward_messages([prepared_original], chat2)
|
|
# XXX there might be two EVENT_MSGS_CHANGED and only one of them
|
|
# is the one caused by forwarding
|
|
forwarded_id = wait_msgs_changed(ac1, chat2.id)
|
|
if forwarded_id == 0:
|
|
forwarded_id = wait_msgs_changed(ac1, chat2.id)
|
|
assert forwarded_id
|
|
forwarded_msg = ac1.get_message_by_id(forwarded_id)
|
|
assert forwarded_msg.is_out_preparing()
|
|
|
|
lp.sec("finish creating the file and send it")
|
|
assert prepared_original.is_out_preparing()
|
|
shutil.copyfile(orig, path)
|
|
chat.send_prepared(prepared_original)
|
|
assert prepared_original.is_out_pending() or prepared_original.is_out_delivered()
|
|
wait_msgs_changed(ac1, chat.id, prepared_original.id)
|
|
|
|
lp.sec("expect the forwarded message to be sent now too")
|
|
wait_msgs_changed(ac1, chat2.id, forwarded_id)
|
|
fwd_msg = ac1.get_message_by_id(forwarded_id)
|
|
assert fwd_msg.is_out_pending() or fwd_msg.is_out_delivered()
|
|
|
|
lp.sec("wait for the messages to be delivered to SMTP")
|
|
ev = ac1._evlogger.get_matching("DC_EVENT_MSG_DELIVERED")
|
|
assert ev[1] == chat.id
|
|
assert ev[2] == prepared_original.id
|
|
ev = ac1._evlogger.get_matching("DC_EVENT_MSG_DELIVERED")
|
|
assert ev[1] == chat2.id
|
|
assert ev[2] == forwarded_id
|
|
|
|
lp.sec("wait1 for original or forwarded messages to arrive")
|
|
ev1 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
|
|
assert ev1[1] > const.DC_CHAT_ID_LAST_SPECIAL
|
|
received_original = ac2.get_message_by_id(ev1[2])
|
|
assert cmp(received_original.filename, orig, shallow=False)
|
|
|
|
lp.sec("wait2 for original or forwarded messages to arrive")
|
|
ev2 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
|
|
assert ev2[1] > const.DC_CHAT_ID_LAST_SPECIAL
|
|
assert ev2[1] != ev1[1]
|
|
received_copy = ac2.get_message_by_id(ev2[2])
|
|
assert cmp(received_copy.filename, orig, shallow=False)
|