Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Garage v0.8.3 #619

Merged
lx merged 8 commits from next-0.8 into main 2023-08-29 08:55:46 +00:00
Conversation 0 Commits 8 Files changed 23 +9 -9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 769b6fe054 - Show all commits

18
src/garage/tests/s3/website.rs
View file

@ -440,13 +440,13 @@ async fn test_website_check_domain() {
}; };
let admin_resp = client.request(admin_req()).await.unwrap(); let admin_resp = client.request(admin_req()).await.unwrap();
assert_eq!(admin_resp.status(), StatusCode::NOT_FOUND); assert_eq!(admin_resp.status(), StatusCode::BAD_REQUEST);
let res_body = json_body(admin_resp).await; let res_body = json_body(admin_resp).await;
assert_json_eq!( assert_json_eq!(
res_body, res_body,
json!({ json!({
"code": "NoSuchBucket", "code": "InvalidRequest",
"message": "Bucket not found: ", "message": "Bad request: Domain '' is not managed by Garage",
"region": "garage-integ-test", "region": "garage-integ-test",
"path": "/check", "path": "/check",
}) })
@ -464,13 +464,13 @@ async fn test_website_check_domain() {
}; };
let admin_resp = client.request(admin_req()).await.unwrap(); let admin_resp = client.request(admin_req()).await.unwrap();
assert_eq!(admin_resp.status(), StatusCode::NOT_FOUND); assert_eq!(admin_resp.status(), StatusCode::BAD_REQUEST);
let res_body = json_body(admin_resp).await; let res_body = json_body(admin_resp).await;
assert_json_eq!( assert_json_eq!(
res_body, res_body,
json!({ json!({
"code": "NoSuchBucket", "code": "InvalidRequest",
"message": "Bucket not found: foobar", "message": "Bad request: Domain 'foobar' is not managed by Garage",
"region": "garage-integ-test", "region": "garage-integ-test",
"path": "/check", "path": "/check",
}) })
@ -488,13 +488,13 @@ async fn test_website_check_domain() {
}; };
let admin_resp = client.request(admin_req()).await.unwrap(); let admin_resp = client.request(admin_req()).await.unwrap();
assert_eq!(admin_resp.status(), StatusCode::NOT_FOUND); assert_eq!(admin_resp.status(), StatusCode::BAD_REQUEST);
let res_body = json_body(admin_resp).await; let res_body = json_body(admin_resp).await;
assert_json_eq!( assert_json_eq!(
res_body, res_body,
json!({ json!({
"code": "NoSuchBucket", "code": "InvalidRequest",
"message": "Bucket not found: ☹", "message": "Bad request: Domain '☹' is not managed by Garage",
"region": "garage-integ-test", "region": "garage-integ-test",
"path": "/check", "path": "/check",
}) })