tests: introduce handle command for better command testing
This commit is contained in:
parent
5bfa83032c
commit
df8d3c4662
GPG key ID:
04CC6658320518DF
|
|
@ -53,7 +53,7 @@ deps =
|
|||
pytest
|
||||
pytest-xdist
|
||||
commands =
|
||||
pytest -n2 tests
|
||||
pytest -n4 tests
|
||||
|
||||
[flake8]
|
||||
max_line_length = 120
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ def import_key_from_attachment(file_path: str) -> (str, str, str):
|
|||
uid = key.get_uid("").userid
|
||||
email = validate_email(uid, allow_display_name=True).ascii_email
|
||||
display_name = validate_email(uid, allow_display_name=True).display_name
|
||||
return "".join(keyparts), email, display_name
|
||||
return "".join(keyparts), email, (display_name if display_name else "")
|
||||
|
|
|
|||
2
src/keyserver_bot/errors.py
Normal file
2
src/keyserver_bot/errors.py
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
class KeyNotFound(BaseException):
|
||||
pass
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
from deltachat_rpc_client import events, run_bot_cli, EventType, Message
|
||||
from email_validator import validate_email, EmailNotValidError
|
||||
|
||||
from keyserver_bot.wkd import request_from_wkd
|
||||
from keyserver_bot.wkd import request_from_wkd, WKD_TIMEOUT
|
||||
from keyserver_bot.koo import request_from_koo
|
||||
from keyserver_bot.attachment import import_key_from_attachment
|
||||
from keyserver_bot.vcard import construct_vcard, save_vcard
|
||||
from keyserver_bot.errors import KeyNotFound
|
||||
|
||||
hooks = events.HookCollection()
|
||||
|
||||
|
|
@ -28,25 +29,12 @@ def command(event):
|
|||
if snapshot.text == "Messages are guaranteed to be end-to-end encrypted from now on.":
|
||||
return
|
||||
|
||||
email = snapshot.text
|
||||
public_key = None
|
||||
display_name = None
|
||||
|
||||
if snapshot.get("file"):
|
||||
public_key, email_from_uid, display_name = import_key_from_attachment(snapshot.file)
|
||||
email = email if email else email_from_uid
|
||||
|
||||
try:
|
||||
email = validate_email(email, allow_display_name=True).ascii_email
|
||||
if not display_name:
|
||||
display_name = validate_email(email, allow_display_name=True).display_name
|
||||
public_key, email, display_name = handle_command(snapshot.text, snapshot.get("file"))
|
||||
except KeyNotFound:
|
||||
return snapshot.chat.send_text(f"Sorry, I could not find a key for {snapshot.text}.")
|
||||
except EmailNotValidError:
|
||||
return snapshot.chat.send_text(HELP_MSG + f"\n\n{email} is not an email address :/")
|
||||
|
||||
if not public_key:
|
||||
public_key = request_key_by_email(email)
|
||||
if not public_key:
|
||||
return snapshot.chat.send_text(f"Sorry, I could not find a key for {email}.")
|
||||
return snapshot.chat.send_text(HELP_MSG + f"\n\n{snapshot.text} is not an email address :/")
|
||||
|
||||
vcard = construct_vcard(email, public_key, display_name)
|
||||
vcard_path = f"/tmp/{email}.vcf"
|
||||
|
|
@ -54,14 +42,40 @@ def command(event):
|
|||
return snapshot.chat.send_file(vcard_path)
|
||||
|
||||
|
||||
def request_key_by_email(email: str) -> str:
|
||||
domain = email.split("@")[1]
|
||||
public_key = request_from_wkd(email, domain)
|
||||
def handle_command(text: str, file_path: str = None, wkd_timeout: int = WKD_TIMEOUT) -> (str, str, str):
|
||||
"""Handle the user's command; this is a separate function so it can be tested more easily.
|
||||
|
||||
:param text: the text of the user's message
|
||||
:param file_path: the path to the message's attachment, if there is one
|
||||
:param wkd_timeout: the timeout for WKD tests, can be set here for test purposes
|
||||
:return: a tuple with public key, email, and display_name
|
||||
"""
|
||||
public_key = None
|
||||
try:
|
||||
email = validate_email(text, allow_display_name=True).ascii_email
|
||||
display_name = validate_email(text, allow_display_name=True).display_name
|
||||
except EmailNotValidError:
|
||||
display_name = text
|
||||
email = None
|
||||
|
||||
if file_path:
|
||||
public_key, email_from_uid, display_name_from_uid = import_key_from_attachment(file_path)
|
||||
email = email if email else email_from_uid
|
||||
display_name = display_name if display_name else display_name_from_uid
|
||||
|
||||
if not public_key:
|
||||
public_key = request_from_wkd(email, f"openpgpkey.{domain}")
|
||||
if not email:
|
||||
raise EmailNotValidError
|
||||
domain = email.split("@")[1]
|
||||
public_key = request_from_wkd(email, domain, timeout=wkd_timeout)
|
||||
if not public_key:
|
||||
public_key = request_from_wkd(email, f"openpgpkey.{domain}", timeout=wkd_timeout)
|
||||
if not public_key:
|
||||
public_key = request_from_koo(email)
|
||||
return public_key
|
||||
if not public_key:
|
||||
raise KeyNotFound
|
||||
|
||||
return public_key, email, (display_name if display_name else "")
|
||||
|
||||
|
||||
@hooks.on(events.RawEvent)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@ import requests
|
|||
import base64
|
||||
|
||||
|
||||
def request_from_wkd(email: str, server: str) -> str:
|
||||
WKD_TIMEOUT = 10
|
||||
|
||||
|
||||
def request_from_wkd(email: str, server: str, timeout=WKD_TIMEOUT) -> str:
|
||||
"""Request the public key from WKD by email
|
||||
|
||||
:param email: an RFC 5322 email address
|
||||
|
|
@ -14,7 +17,7 @@ def request_from_wkd(email: str, server: str) -> str:
|
|||
wkd_hash = wkdhash.userid_to_wkd_hash(email)
|
||||
wkd_url = f"https://{server}/.well-known/openpgpkey/{domain}/hu/{wkd_hash}?l={localpart}"
|
||||
try:
|
||||
r = requests.get(wkd_url, timeout=10)
|
||||
r = requests.get(wkd_url, timeout=timeout)
|
||||
except requests.exceptions.SSLError:
|
||||
print(f"SSL Error when querying {wkd_url}")
|
||||
return ""
|
||||
|
|
|
|||
BIN
tests/assets/vcardlogo.png
Normal file
BIN
tests/assets/vcardlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -1,9 +1,14 @@
|
|||
import os
|
||||
import pytest
|
||||
from keyserver_bot.hooks import request_key_by_email, delete_data
|
||||
from email_validator import EmailNotValidError
|
||||
from keyserver_bot.hooks import delete_data, handle_command
|
||||
from keyserver_bot.errors import KeyNotFound
|
||||
from deltachat_rpc_client.pytestplugin import acfactory
|
||||
|
||||
|
||||
WKD_TIMEOUT = 1
|
||||
|
||||
|
||||
def test_delete_data(acfactory):
|
||||
if not os.getenv("CHATMAIL_DOMAIN"):
|
||||
os.environ["CHATMAIL_DOMAIN"] = "nine.testrun.org"
|
||||
|
|
@ -14,8 +19,6 @@ def test_delete_data(acfactory):
|
|||
|
||||
chat.send_text("hi :)")
|
||||
msg = bot.wait_for_incoming_msg()
|
||||
msg = msg.get_snapshot().chat.send_text("command not found :P")
|
||||
user.wait_for_incoming_msg()
|
||||
|
||||
assert len(bot.get_chatlist()) == 3
|
||||
delete_data(msg.get_snapshot())
|
||||
|
|
@ -24,18 +27,67 @@ def test_delete_data(acfactory):
|
|||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("email", "public_key"),
|
||||
("text", "file_path", "email", "display_name", "public_key"),
|
||||
[
|
||||
("adsokasd@ingrdsuf.org", ""),
|
||||
(
|
||||
( # from keys.openpgp.org
|
||||
"missytake@systemli.org",
|
||||
None,
|
||||
"missytake@systemli.org",
|
||||
"",
|
||||
"xjMEXcLIEBYJKwYBBAHaRw8BAQdAmlYU7TEgGL3eq2WXC95tQtZYHjpJOCjb7qq3vJd1lG7NIm1pc3N5dGFrZSA8bWlzc3l0YWtlQHN5c3RlbWxpLm9yZz7CkAQTFggAOAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBEX/6kI9pCw7MYVUWQTMZlgyBRjfBQJnDuTLAAoJEATMZlgyBRjfeUUA/0P0E/quL71dn5Zjc4ewsnykT1GODazGmk+xprSwAvEyAPwJy+uJgJz5pSFdmi2lGRrOERmKUu8AdQ/M7dSm6kt3AMKQBBMWCAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAmcO5FkACgkQBMxmWDIFGN+0EAD+PVALMtR4PDB4aaxpJ5L1p6mGmq1lb8wqZtdAyHK9+7EA/jPU12/e368B6OHknY1YzGxQxyPETcL8hUS26CU6wnUEzRZtaXNzeXRha2VAc3lzdGVtbGkub3JnwpAEExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQRF/+pCPaQsOzGFVFkEzGZYMgUY3wUCZw7kywAKCRAEzGZYMgUY37s7AP4uOSeC9cwDKnPnov7L6Sp0axUNncX+n5sjepkPpwgVIQD/Zt85kzYrodvsx4QdolweWDFrH9DFxTsTSw2GWIIE6Q3CkAQTFggAOAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBEX/6kI9pCw7MYVUWQTMZlgyBRjfBQJnDuRZAAoJEATMZlgyBRjf3lkBAPdeXSQY9oPO4wHv+pYE5d6+4ij8plA6tSReaqhneOKtAQCJguCnqcH8A9KKZ97n1gIBFnJ7xhdNTPLPoAbYE1BAB8KWBBMWCAA+FiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAl3CyBACGwMFCQlmAYAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQBMxmWDIFGN9eHAD/SR+CRWWJ5km4pfeU48Y88+6nKA/T6egmav9NIZTjw9cBAIEk6yInsxZj/2Ot9AW8vr+cyuiG9FtZOuWvbNh4oYUJzjMEXcLKyhYJKwYBBAHaRw8BAQdAtUIjrOUmkTbVVkwIXeAkC/s3Z1wrW2/+KIgkQbbi38XCeAQYFggAIAIbIBYhBEX/6kI9pCw7MYVUWQTMZlgyBRjfBQJnDuULAAoJEATMZlgyBRjf19ABALR4jIhWK/5e87V3+xuX9R0MAyBDztZjb8nfXJ3HWK65AQC6S7JybxebS+jHSavTIF0nuaaqBXZx3me1edqwVVBAD8J+BBgWCAAmFiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAl3CysoCGyAFCQlmAYAACgkQBMxmWDIFGN/IQgEA8WwKDEEtbyIiCr5pLD/eqJ2m1xIsKKP/0sH0ADPMwjEA/jvMjOjbrh5WZuUnf+ddcVB7GStu3SZtenkB/rK1+s0EzjgEXcLIEBIKKwYBBAGXVQEFAQEHQGTy3kLa+rSeHhK35fDN/k46zZFh+LDZQ0a2552FuPJ6AwEIB8J4BBgWCAAgAhsMFiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAmcO5P8ACgkQBMxmWDIFGN/jJgEA5+ESV8PtiUcwxml7GpTGwbIv8GoDA1YlPcUeku/S20QA/iVvzlf8Oj5Wvhet8VMzU37wWsFJ2n6aAyM2WmOrPVoPwn4EGBYIACYWIQRF/+pCPaQsOzGFVFkEzGZYMgUY3wUCXcLIEAIbDAUJCWYBgAAKCRAEzGZYMgUY3zZnAP9JMp+PI+1H4x3D62Qg4udjL6zypFKTrcrUnyWNcoWzoQD/W3uJ7M2sbOdAdHcj246koYP32BrR/7Wtc0/7yJPfqQk==oePr",
|
||||
),
|
||||
(
|
||||
( # from protonmail's WKD
|
||||
"sdjif2mlij@protonmail.com",
|
||||
None,
|
||||
"sdjif2mlij@protonmail.com",
|
||||
"",
|
||||
"xjMEZ+/HahYJKwYBBAHaRw8BAQdAzRZOcQEkaPGwUYBVHsKTVX+4nP05ZwLQ3wYUod1IQyjNNXNkamlmMm1saWpAcHJvdG9ubWFpbC5jb20gPHNkamlmMm1saWpAcHJvdG9ubWFpbC5jb20+wsARBBMWCgCDBYJn78dqAwsJBwmQ9od3MCAJzKNFFAAAAAAAHAAgc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ3e7fGtn2OkXwNFoBOAEgwoRygRlwr41fcO4LsJ/1HcyAxUKCAQWAAIBAhkBApsDAh4BFiEERU5l1enHSVCTOUnc9od3MCAJzKMAAAuPAQCQ0PFlbngJRtJ36yloWfHwTY168TDlMGeL+nAxJ1GUQAEA31H+NukIwEzCwQWh7aoFeY9eJHXVoaeh0swfvJA5yQ/CwB4EEBYIAJAFgmfvx6cFgwDtTgAJENgGwa9ZeOjHNRQAAAAAABwAEHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmfU5CAfgrGEZMQfk/lTyXT2LBxvcGVucGdwLWNhQHByb3Rvbi5tZSA8b3BlbnBncC1jYUBwcm90b24ubWU+FiEECoZS/l1TOGBXiZ/p2AbBr1l46McAAJCrAP4tMWMSLKAykI/JnR+94aE2+E4dCTslkW/svb1o7zGLbwEAg/fo6sOxa3wHr9xnCbUUrxZ0Dnh/21zJ3atL6zMpYQHOOARn78dqEgorBgEEAZdVAQUBAQdATm5zMhEn2/S+UB3qKfeV424+iyvIr2p3FEzxuzUQKQEDAQgHwr4EGBYKAHAFgmfvx2oJkPaHdzAgCcyjRRQAAAAAABwAIHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmf94HNvbCT5aX/ifcaDK2bIjzmS69JdQo1AcOt3X8AwFQKbDBYhBEVOZdXpx0lQkzlJ3PaHdzAgCcyjAACVUgEA8Agw7R9+a72WsKOq691JIYPGDfNYCKNHFllsQAfHHHYA/3x+rG9YQTbdAuuFi1ciGvgo9DAWVv8Bt7ibBqEVAuQN",
|
||||
),
|
||||
( # RSA3072, exported from Thunderbird
|
||||
"",
|
||||
"tests/assets/iCloud Debug_iclouddbg@nine.testrun.org-0x29E2254EF6BE9F1A-pub.asc",
|
||||
"iclouddbg@nine.testrun.org",
|
||||
"iCloud Debug",
|
||||
"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",
|
||||
),
|
||||
( # ed25519, exported from Thunderbird
|
||||
"",
|
||||
"tests/assets/missytake-pub.asc",
|
||||
"missytake@systemli.org",
|
||||
"",
|
||||
"mDMEXcLIEBYJKwYBBAHaRw8BAQdAmlYU7TEgGL3eq2WXC95tQtZYHjpJOCjb7qq3vJd1lG60Fm1pc3N5dGFrZUBzeXN0ZW1saS5vcmeIlgQTFggAPhYhBEX/6kI9pCw7MYVUWQTMZlgyBRjfBQJdwsgQAhsDBQkJZgGABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEATMZlgyBRjfXhwA/0kfgkVlieZJuKX3lOPGPPPupygP0+noJmr/TSGU48PXAQCBJOsiJ7MWY/9jrfQFvL6/nMrohvRbWTrlr2zYeKGFCYiQBBMWCAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAmcO5FkACgkQBMxmWDIFGN/eWQEA915dJBj2g87jAe/6lgTl3r7iKPymUDq1JF5qqGd44q0BAImC4KepwfwD0opn3ufWAgEWcnvGF01M8s+gBtgTUEAHiJAEExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQRF/+pCPaQsOzGFVFkEzGZYMgUY3wUCZw7kywAKCRAEzGZYMgUY37s7AP4uOSeC9cwDKnPnov7L6Sp0axUNncX+n5sjepkPpwgVIQD/Zt85kzYrodvsx4QdolweWDFrH9DFxTsTSw2GWIIE6Q20Im1pc3N5dGFrZSA8bWlzc3l0YWtlQHN5c3RlbWxpLm9yZz6IkAQTFggAOAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBEX/6kI9pCw7MYVUWQTMZlgyBRjfBQJnDuRZAAoJEATMZlgyBRjftBAA/j1QCzLUeDwweGmsaSeS9aephpqtZW/MKmbXQMhyvfuxAP4z1Ndv3t+vAejh5J2NWMxsUMcjxE3C/IVEtuglOsJ1BIiQBBMWCAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAmcO5MsACgkQBMxmWDIFGN95RQD/Q/QT+q4vvV2flmNzh7CyfKRPUY4NrMaaT7GmtLAC8TIA/AnL64mAnPmlIV2aLaUZGs4RGYpS7wB1D8zt1KbqS3cAuDgEXcLIEBIKKwYBBAGXVQEFAQEHQGTy3kLa+rSeHhK35fDN/k46zZFh+LDZQ0a2552FuPJ6AwEIB4h4BBgWCAAgAhsMFiEERf/qQj2kLDsxhVRZBMxmWDIFGN8FAmcO5P8ACgkQBMxmWDIFGN/jJgEA5+ESV8PtiUcwxml7GpTGwbIv8GoDA1YlPcUeku/S20QA/iVvzlf8Oj5Wvhet8VMzU37wWsFJ2n6aAyM2WmOrPVoPuDMEXcLKyhYJKwYBBAHaRw8BAQdAtUIjrOUmkTbVVkwIXeAkC/s3Z1wrW2/+KIgkQbbi38WIeAQYFggAIAIbIBYhBEX/6kI9pCw7MYVUWQTMZlgyBRjfBQJnDuULAAoJEATMZlgyBRjf19ABALR4jIhWK/5e87V3+xuX9R0MAyBDztZjb8nfXJ3HWK65AQC6S7JybxebS+jHSavTIF0nuaaqBXZx3me1edqwVVBADw==",
|
||||
),
|
||||
( # ed25519, generated in Delta Chat
|
||||
"asdf",
|
||||
"tests/assets/n21bbif8b@nine.testrun.org-(0xE689A2471F853914)-public.asc",
|
||||
"n21bbif8b@nine.testrun.org",
|
||||
"asdf",
|
||||
"xjMEZ/iePRYJKwYBBAHaRw8BAQdA5aVYHFoa20U6SWubzIUi24xgBeFEf+QqhGuxuShyFULNHDxuMjFiYmlmOGJAbmluZS50ZXN0cnVuLm9yZz7CjQQQFggANQIZAQUCZ/iePQIbAwQLCQgHBhUICQoLAgMWAgEBJxYhBDThD8TfA/wGMPw8AeaJokcfhTkUAAoJEOaJokcfhTkUWhUBANZqS1OH7PlwXON6cmvoUvY938IrWRcdOQNvoeAHQkksAP9oK/uUnG6nyzYYX7heaV8CnY8U7Z/LkgS6VpYvClD8Dc44BGf4nj0SCisGAQQBl1UBBQEBB0BgBB0O+YD0RgGvE0KqBtJtxPrYcwUUwwtbGWrMHc11VwMBCAfCeAQYFggAIAUCZ/iePQIbDBYhBDThD8TfA/wGMPw8AeaJokcfhTkUAAoJEOaJokcfhTkU9eIBAP9DXFU4b3bJ1ml8rt45s6FixaGUyIK22KIe+JmH1Mn/AP0fdYczGhtX017RWHM1DfI2Tjx6C3ANKhQqPqDHpbXmBw==",
|
||||
),
|
||||
( # ed25519, generated in Delta Chat
|
||||
"asdf <n21bbif8b@nine.testrun.org>",
|
||||
"tests/assets/n21bbif8b@nine.testrun.org-(0xE689A2471F853914)-public.asc",
|
||||
"n21bbif8b@nine.testrun.org",
|
||||
"asdf",
|
||||
"xjMEZ/iePRYJKwYBBAHaRw8BAQdA5aVYHFoa20U6SWubzIUi24xgBeFEf+QqhGuxuShyFULNHDxuMjFiYmlmOGJAbmluZS50ZXN0cnVuLm9yZz7CjQQQFggANQIZAQUCZ/iePQIbAwQLCQgHBhUICQoLAgMWAgEBJxYhBDThD8TfA/wGMPw8AeaJokcfhTkUAAoJEOaJokcfhTkUWhUBANZqS1OH7PlwXON6cmvoUvY938IrWRcdOQNvoeAHQkksAP9oK/uUnG6nyzYYX7heaV8CnY8U7Z/LkgS6VpYvClD8Dc44BGf4nj0SCisGAQQBl1UBBQEBB0BgBB0O+YD0RgGvE0KqBtJtxPrYcwUUwwtbGWrMHc11VwMBCAfCeAQYFggAIAUCZ/iePQIbDBYhBDThD8TfA/wGMPw8AeaJokcfhTkUAAoJEOaJokcfhTkU9eIBAP9DXFU4b3bJ1ml8rt45s6FixaGUyIK22KIe+JmH1Mn/AP0fdYczGhtX017RWHM1DfI2Tjx6C3ANKhQqPqDHpbXmBw==",
|
||||
),
|
||||
],
|
||||
)
|
||||
def test_request_by_email(email, public_key):
|
||||
assert public_key == request_key_by_email(email)
|
||||
def test_handle_command(text, file_path, email, display_name, public_key):
|
||||
assert (public_key, email, display_name) == handle_command(text, file_path)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("text", "file_path", "error"),
|
||||
[
|
||||
("adsokasd@systemli.org", None, KeyNotFound),
|
||||
("", "tests/test_hooks.py", EmailNotValidError),
|
||||
("", "tests/assets/vcardlogo.png", EmailNotValidError),
|
||||
("asdf@.org", None, EmailNotValidError),
|
||||
("asdf", None, EmailNotValidError),
|
||||
("adsokasd@ingrdsuf.org", None, EmailNotValidError),
|
||||
],
|
||||
)
|
||||
def test_handle_command_errors(text, file_path, error):
|
||||
with pytest.raises(error):
|
||||
handle_command(text, file_path, wkd_timeout=WKD_TIMEOUT)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@ import pytest
|
|||
import keyserver_bot.wkd
|
||||
|
||||
|
||||
WKD_TIMEOUT = 2
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("email", "server", "public_key"),
|
||||
[
|
||||
|
|
@ -16,4 +19,4 @@ import keyserver_bot.wkd
|
|||
],
|
||||
)
|
||||
def test_request_by_email(email, server, public_key):
|
||||
assert public_key == keyserver_bot.wkd.request_from_wkd(email, server)
|
||||
assert public_key == keyserver_bot.wkd.request_from_wkd(email, server, timeout=WKD_TIMEOUT)
|
||||
|
|
|
|||
Loading…
Reference in a new issue