snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-23 13:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error detection

Browse Source
This commit is contained in:
Mubelotix
2025-08-26 12:11:03 +02:00
parent 1528cfe683
commit 40b49543f1
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
crates/xtask/src/common/command.rs
View File

@ -185,6 +185,32 @@ pub async fn run(
request.send().await.with_context(|| format!("error sending command: {}", command))?; request.send().await.with_context(|| format!("error sending command: {}", command))?;
let code = response.status(); let code = response.status();
if let Some(expected_response) = &command.expected_response {
let response: serde_json::Value = response
.json()
.await
.context("could not deserialize response as JSON")
.context("parsing response when checking expected response")?;
if return_value {
return Ok(Some((response, code)));
}
if &response != expected_response {
let expected_pretty = serde_json::to_string_pretty(expected_response)
.context("serializing expected response as pretty JSON")?;
let response_pretty = serde_json::to_string_pretty(&response)
.context("serializing response as pretty JSON")?;
let diff = SimpleDiff::from_str(&expected_pretty, &response_pretty, "expected", "got");
bail!("unexpected response:\n{diff}");
}
} else if return_value {
let response: serde_json::Value = response
.json()
.await
.context("could not deserialize response as JSON")
.context("parsing response when recording expected response")?;
return Ok(Some((response, code)));
}
if let Some(expected_status) = command.expected_status { if let Some(expected_status) = command.expected_status {
if code.as_u16() != expected_status { if code.as_u16() != expected_status {
@ -213,29 +239,6 @@ pub async fn run(
bail!("server error: server responded with error code {code} and '{response}'") bail!("server error: server responded with error code {code} and '{response}'")
} }
if return_value {
let response: serde_json::Value = response
.json()
.await
.context("could not deserialize response as JSON")
.context("parsing response when recording expected response")?;
return Ok(Some((response, code)));
} else if let Some(expected_response) = &command.expected_response {
let response: serde_json::Value = response
.json()
.await
.context("could not deserialize response as JSON")
.context("parsing response when checking expected response")?;
if &response != expected_response {
let expected_pretty = serde_json::to_string_pretty(expected_response)
.context("serializing expected response as pretty JSON")?;
let response_pretty = serde_json::to_string_pretty(&response)
.context("serializing response as pretty JSON")?;
let diff = SimpleDiff::from_str(&expected_pretty, &response_pretty, "expected", "got");
bail!("unexpected response:\n{diff}");
}
}
Ok(None) Ok(None)
} }