diff options
| author | Alex <alex@adnab.me> | 2023-01-26 21:10:21 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-01-26 21:10:21 +0000 |
| commit | f2c256cac4e599335d592dd580011cf15f278a51 (patch) | |
| tree | 8a7e90cf4bcf40ef7513e9ffaa636a012ebcc4a9 /src/garage/tests | |
| parent | a08e01f17a9e4bb80880e28a4a28b2d88a9aec83 (diff) | |
| parent | d6af95d20520eec64e5e4c0c873c6e3a8ac1509d (diff) | |
| download | garage-f2c256cac4e599335d592dd580011cf15f278a51.tar.gz garage-f2c256cac4e599335d592dd580011cf15f278a51.zip | |
Merge pull request 'Many clippy lints fixed' (#488) from k2v-watch-range-2 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/488
Diffstat (limited to 'src/garage/tests')
| -rw-r--r-- | src/garage/tests/k2v/poll.rs | 7 | ||||
| -rw-r--r-- | src/garage/tests/s3/website.rs | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/garage/tests/k2v/poll.rs b/src/garage/tests/k2v/poll.rs index f54cc5d4..5280255a 100644 --- a/src/garage/tests/k2v/poll.rs +++ b/src/garage/tests/k2v/poll.rs @@ -1,3 +1,4 @@ +use base64::prelude::*; use hyper::{Method, StatusCode}; use std::time::Duration; @@ -160,7 +161,7 @@ async fn test_poll_range() { json!( { "items": [ - {"sk": "test1", "ct": ct, "v": [base64::encode(b"Initial value")]}, + {"sk": "test1", "ct": ct, "v": [BASE64_STANDARD.encode(b"Initial value")]}, ], "seenMarker": seen_marker, } @@ -212,7 +213,7 @@ async fn test_poll_range() { assert_json_eq!(&json_res["items"][0]["sk"], json!("test1")); assert_json_eq!( &json_res["items"][0]["v"], - json!([base64::encode(b"New value")]) + json!([BASE64_STANDARD.encode(b"New value")]) ); // Now we will add a value on a different key @@ -259,6 +260,6 @@ async fn test_poll_range() { assert_json_eq!(&json_res["items"][0]["sk"], json!("test2")); assert_json_eq!( &json_res["items"][0]["v"], - json!([base64::encode(b"Other value")]) + json!([BASE64_STANDARD.encode(b"Other value")]) ); } diff --git a/src/garage/tests/s3/website.rs b/src/garage/tests/s3/website.rs index f57e31ee..4e136e1b 100644 --- a/src/garage/tests/s3/website.rs +++ b/src/garage/tests/s3/website.rs @@ -57,7 +57,7 @@ async fn test_website() { Request::builder() .method("GET") .uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port)) - .header("domain", format!("{}", BCKT_NAME)) + .header("domain", BCKT_NAME.to_string()) .body(Body::empty()) .unwrap() }; @@ -92,7 +92,7 @@ async fn test_website() { Request::builder() .method("GET") .uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port)) - .header("domain", format!("{}", BCKT_NAME)) + .header("domain", BCKT_NAME.to_string()) .body(Body::empty()) .unwrap() }; @@ -121,7 +121,7 @@ async fn test_website() { Request::builder() .method("GET") .uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port)) - .header("domain", format!("{}", BCKT_NAME)) + .header("domain", BCKT_NAME.to_string()) .body(Body::empty()) .unwrap() }; |