snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-01-31 07:23:15 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

restore test

Browse Source
This commit is contained in:
mpostma 2021-02-24 13:35:56 +01:00
parent 4552c42f88
commit 7d2ae9089e
No known key found for this signature in database
GPG Key ID: CBC8A7C1D7A28C3A
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meilisearch-http/src/index_controller/local_index_controller/mod.rs
View File

@ -112,17 +112,12 @@ impl IndexController for LocalIndexController {
.map(UpdateStatus::from) .map(UpdateStatus::from)
.into_iter() .into_iter()
.chain(pending. .chain(pending.
filter_map(|p| p.ok()) filter_map(Result::ok)
// if an update is processing, filter out this update from the pending // If an update is processing, filter out this update from the pending
// updates. // updates.
.filter(|(_, u)| { .filter(|(_, u)| processing_id
println!("processing: {:?}", processing_id); .map(|id| id != u.id())
processing_id .unwrap_or(true))
.map(|id| {
println!("id: {}, pending: {}", id, u.id());
id != u.id()
})
.unwrap_or(true)})
.map(|(_, u)| UpdateStatus::from(u))) .map(|(_, u)| UpdateStatus::from(u)))
.chain(aborted.filter_map(Result::ok).map(|(_, u)| UpdateStatus::from(u))) .chain(aborted.filter_map(Result::ok).map(|(_, u)| UpdateStatus::from(u)))
.chain(processed.filter_map(Result::ok).map(|(_, u)| UpdateStatus::from(u))) .chain(processed.filter_map(Result::ok).map(|(_, u)| UpdateStatus::from(u)))

2
meilisearch-http/tests/updates/mod.rs
View File

@ -50,9 +50,7 @@ async fn list_no_updates() {
assert!(response.as_array().unwrap().is_empty()); assert!(response.as_array().unwrap().is_empty());
} }
// TODO: fix #32
#[actix_rt::test] #[actix_rt::test]
#[ignore]
async fn list_updates() { async fn list_updates() {
let server = Server::new().await; let server = Server::new().await;
let index = server.index("test"); let index = server.index("test");