mirror of
https://github.com/Nutomic/ibis.git
synced 2024-11-25 07:51:08 +00:00
Fix test failures
This commit is contained in:
parent
5556d0fef2
commit
34068cffa1
2 changed files with 21 additions and 7 deletions
|
@ -20,7 +20,7 @@ use {
|
||||||
pub const MAIN_PAGE_NAME: &str = "Main_Page";
|
pub const MAIN_PAGE_NAME: &str = "Main_Page";
|
||||||
|
|
||||||
/// Should be an enum Title/Id but fails due to https://github.com/nox/serde_urlencoded/issues/66
|
/// Should be an enum Title/Id but fails due to https://github.com/nox/serde_urlencoded/issues/66
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug)]
|
#[derive(Deserialize, Serialize, Clone, Debug, Default)]
|
||||||
pub struct GetArticleForm {
|
pub struct GetArticleForm {
|
||||||
pub title: Option<String>,
|
pub title: Option<String>,
|
||||||
pub domain: Option<String>,
|
pub domain: Option<String>,
|
||||||
|
|
|
@ -163,10 +163,9 @@ async fn test_synchronize_articles() -> MyResult<()> {
|
||||||
.resolve_instance(Url::parse(&format!("http://{}", &data.alpha.hostname))?)
|
.resolve_instance(Url::parse(&format!("http://{}", &data.alpha.hostname))?)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let mut get_article_data = GetArticleForm {
|
let get_article_data = GetArticleForm {
|
||||||
title: Some(create_res.article.title),
|
title: Some(create_res.article.title.clone()),
|
||||||
domain: None,
|
..Default::default()
|
||||||
id: None,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// try to read remote article by name, fails without domain
|
// try to read remote article by name, fails without domain
|
||||||
|
@ -174,8 +173,23 @@ async fn test_synchronize_articles() -> MyResult<()> {
|
||||||
assert!(get_res.is_err());
|
assert!(get_res.is_err());
|
||||||
|
|
||||||
// get the article with instance id and compare
|
// get the article with instance id and compare
|
||||||
get_article_data.domain = Some(instance.domain);
|
let get_res = RetryFuture::new(
|
||||||
let get_res = data.beta.get_article(get_article_data).await?;
|
|| async {
|
||||||
|
let get_article_data = GetArticleForm {
|
||||||
|
title: Some(create_res.article.title.clone()),
|
||||||
|
domain: Some(instance.domain.clone()),
|
||||||
|
id: None,
|
||||||
|
};
|
||||||
|
let res = data.beta.get_article(get_article_data).await;
|
||||||
|
match res {
|
||||||
|
Err(_) => Err(RetryPolicy::<String>::Retry(None)),
|
||||||
|
Ok(a) if a.edits.len() < 2 => Err(RetryPolicy::Retry(None)),
|
||||||
|
Ok(a) => Ok(a),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
LinearRetryStrategy::new(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
assert_eq!(create_res.article.ap_id, get_res.article.ap_id);
|
assert_eq!(create_res.article.ap_id, get_res.article.ap_id);
|
||||||
assert_eq!(create_form.title, get_res.article.title);
|
assert_eq!(create_form.title, get_res.article.title);
|
||||||
assert_eq!(2, get_res.edits.len());
|
assert_eq!(2, get_res.edits.len());
|
||||||
|
|
Loading…
Reference in a new issue