kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

Refactor test.

This commit is contained in:
Justus Winter 2019-03-11 12:06:44 +01:00
parent 2b5e47e505
commit 9de280562b
No known key found for this signature in database
GPG Key ID: 686F55B4AB2B3386
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/web/mod.rs
View File

@ -872,19 +872,7 @@ mod tests {
check_hr_responses_by_fingerprint(&client, &tpk);
// Now check for the confirmation mail.
let confirm_re =
regex::bytes::Regex::new("https://domain(/vks/v1/verify[^ \t]*)")
.unwrap();
let confirm_mail =
pop_mail(filemail_into.as_path()).unwrap().unwrap();
let confirm_bytes = confirm_mail.message();
// eprintln!("{}", String::from_utf8_lossy(&confirm_bytes));
let confirm_link =
confirm_re.captures(&confirm_bytes).unwrap()
.get(1).unwrap().as_bytes();
let confirm_uri = String::from_utf8_lossy(confirm_link).to_string();
let response = client.get(&confirm_uri).dispatch();
assert_eq!(response.status(), Status::Ok);
check_mails_and_confirm(&client, filemail_into.as_path());
// Now lookups using the mail address should work.
check_mr_response(
@ -1005,6 +993,21 @@ mod tests {
&tpk);
}
fn check_mails_and_confirm(client: &Client, filemail_path: &Path) {
let confirm_re =
regex::bytes::Regex::new("https://domain(/vks/v1/verify[^ \t]*)")
.unwrap();
let confirm_mail = pop_mail(filemail_path).unwrap().unwrap();
let confirm_bytes = confirm_mail.message();
// eprintln!("{}", String::from_utf8_lossy(&confirm_bytes));
let confirm_link =
confirm_re.captures(&confirm_bytes).unwrap()
.get(1).unwrap().as_bytes();
let confirm_uri = String::from_utf8_lossy(confirm_link).to_string();
let response = client.get(&confirm_uri).dispatch();
assert_eq!(response.status(), Status::Ok);
}
#[test]
fn hkp() {
let (tmpdir, config) = configuration().unwrap();