Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-05 23:22:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor preconfigure handling to not break deltabot's usage of deltachat's test fixtures and

Browse Source 
relax timestamp comparisons
This commit is contained in:
holger krekel
2020-03-27 09:27:43 +01:00
parent f98d0bbc1f
commit 7e1470ea46
5 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
python/tests/conftest.py
View File

@@ -1,33 +1,5 @@
from __future__ import print_function
import os
import pytest
import py
@pytest.fixture(scope="session")
def data():
class Data:
def __init__(self):
self.path = os.path.join(os.path.dirname(__file__), "data")
def get_path(self, bn):
fn = os.path.join(self.path, bn)
assert os.path.exists(fn)
return fn
return Data()
@pytest.fixture(scope='session')
def datadir():
"""The py.path.local object of the test-data/ directory."""
for path in reversed(py.path.local(__file__).parts()):
datadir = path.join('test-data')
if datadir.isdir():
return datadir
else:
pytest.skip('test-data directory not found')
def wait_configuration_progress(account, min_target, max_target=1001):
min_target = min(min_target, max_target)

1
python/tests/data/key Symbolic link
View File

@@ -0,0 +1 @@
../../../test-data/key

11
python/tests/test_account.py
View File

@@ -26,11 +26,12 @@ class TestOfflineAccountBasic:
ac1 = Account(p.strpath, os_name="solarpunk")
ac1.get_info()
def test_preconfigure_keypair(self, acfactory, datadir):
def test_preconfigure_keypair(self, acfactory, data):
ac = acfactory.get_unconfigured_account()
ac._preconfigure_keypair("alice@example.com",
datadir.join("key/alice-public.asc").read(),
datadir.join("key/alice-secret.asc").read())
alice_public = data.read_path("key/alice-public.asc")
alice_secret = data.read_path("key/alice-secret.asc")
assert alice_public and alice_secret
ac._preconfigure_keypair("alice@example.com", alice_public, alice_secret)
def test_getinfo(self, acfactory):
ac1 = acfactory.get_unconfigured_account()
@@ -827,7 +828,7 @@ class TestOnlineAccount:
assert msg_in in chat2.get_messages()
assert chat2.is_deaddrop()
assert chat2.count_fresh_messages() == 0
assert msg_in.time_received > msg_in.time_sent
assert msg_in.time_received >= msg_out.time_sent
lp.sec("create new chat with contact and verify it's proper")
chat2b = ac2.create_chat_by_message(msg_in)