Migrate to test-log

Author: dacut

base-library/Cargo.toml

@@ -29,4 +29,4 @@ tower = { version = "0.4", features = [ "util" ] }
 [dev-dependencies]
 env_logger = "^0.8"
 tokio = { version = "^1.4", features = [ "macros", "rt" ] }
-test-env-log = "0.2"
+test-log = "0.2"

base-library/src/aws4.rs

@@ -21,185 +21,185 @@ const TEST_REGION: &str = "us-east-1";
 const TEST_SERVICE: &str = "service";
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_header_key_duplicate_get_header_key_duplicate() {
     run("get-header-key-duplicate/get-header-key-duplicate").await;
 }
 
 // Canonical request is contrary to RFC 2616
 // #[tokio::test]
-// #[test_env_log::test]
+// #[test_log::test]
 // async fn get_header_value_multiline_get_header_value_multiline() {
 //     run("get-header-value-multiline/get-header-value-multiline").await;
 // }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_header_value_order_get_header_value_order() {
     run("get-header-value-order/get-header-value-order").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_header_value_trim_get_header_value_trim() {
     run("get-header-value-trim/get-header-value-trim").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_unreserved_get_unreserved() {
     run("get-unreserved/get-unreserved").await;
 }
 
 // This encoding issue is taken care of by the frontend.
 // #[tokio::test]
-// #[test_env_log::test]
+// #[test_log::test]
 // async fn get_utf8_get_utf8() {
 //     run("get-utf8/get-utf8").await;
 // }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_empty_query_key_get_vanilla_empty_query_key() {
     run("get-vanilla-empty-query-key/get-vanilla-empty-query-key").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_query_order_key_case_get_vanilla_query_order_key_case() {
     run("get-vanilla-query-order-key-case/get-vanilla-query-order-key-case").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_query_order_key_get_vanilla_query_order_key() {
     run("get-vanilla-query-order-key/get-vanilla-query-order-key").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_query_order_value_get_vanilla_query_order_value() {
     run("get-vanilla-query-order-value/get-vanilla-query-order-value").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_query_unreserved_get_vanilla_query_unreserved() {
     run("get-vanilla-query-unreserved/get-vanilla-query-unreserved").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_query_get_vanilla_query() {
     run("get-vanilla-query/get-vanilla-query").await;
 }
 
 // This encoding issue is taken care of/rejected by the frontend.
 // #[tokio::test]
-// #[test_env_log::test]
+// #[test_log::test]
 // async fn get_vanilla_utf8_query_get_vanilla_utf8_query() {
 //     run("get-vanilla-utf8-query/get-vanilla-utf8-query").await;
 // }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn get_vanilla_get_vanilla() {
     run("get-vanilla/get-vanilla").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn normalize_path_get_relative_relative_get_relative_relative() {
     run("normalize-path/get-relative-relative/get-relative-relative").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn normalize_path_get_relative_get_relative() {
     run("normalize-path/get-relative/get-relative").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn normalize_path_get_slash_dot_slash_get_slash_dot_slash() {
     run("normalize-path/get-slash-dot-slash/get-slash-dot-slash").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn normalize_path_get_slash_pointless_dot_get_slash_pointless_dot() {
     run("normalize-path/get-slash-pointless-dot/get-slash-pointless-dot").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn normalize_path_get_slash_get_slash() {
     run("normalize-path/get-slash/get-slash").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn normalize_path_get_slashes_get_slashes() {
     run("normalize-path/get-slashes/get-slashes").await;
 }
 
 // This encoding issue is taken care of by the HTTP frontend.
 // #[tokio::test]
-// #[test_env_log::test]
+// #[test_log::test]
 // async fn normalize_path_get_space_get_space() {
 //     run("normalize-path/get-space/get-space").await;
 // }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_header_key_case_post_header_key_case() {
     run("post-header-key-case/post-header-key-case").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_header_key_sort_post_header_key_sort() {
     run("post-header-key-sort/post-header-key-sort").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_header_value_case_post_header_value_case() {
     run("post-header-value-case/post-header-value-case").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_sts_token_post_sts_header_after_post_sts_header_after() {
     run("post-sts-token/post-sts-header-after/post-sts-header-after").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_sts_token_post_sts_header_before_post_sts_header_before() {
     run("post-sts-token/post-sts-header-before/post-sts-header-before").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_vanilla_empty_query_value_post_vanilla_empty_query_value() {
     run("post-vanilla-empty-query-value/post-vanilla-empty-query-value").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_vanilla_query_post_vanilla_query() {
     run("post-vanilla-query/post-vanilla-query").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_vanilla_post_vanilla() {
     run("post-vanilla/post-vanilla").await;
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_x_www_form_urlencoded_parameters_post_x_www_form_urlencoded_parameters() {
     run("post-x-www-form-urlencoded-parameters/post-x-www-form-urlencoded-parameters").await;
 }
@@ -209,7 +209,7 @@ This test is disabled for now -- it does not seem to encode the signed request
 properly.
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn post_x_www_form_urlencoded_post_x_www_form_urlencoded() {
     run("post-x-www-form-urlencoded/post-x-www-form-urlencoded").await;
 }

base-library/src/unittest.rs

@@ -11,7 +11,7 @@ use http::{
     uri::{PathAndQuery, Uri},
 };
 use scratchstack_aws_principal::PrincipalActor;
-use test_env_log::{self, test};
+use test_log::{self, test};
 use tokio;
 
 const TEST_REGION: &str = "us-east-1";
@@ -265,7 +265,7 @@ async fn run_auth_test_get_err(auth_str: &str) -> SignatureError {
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_missing_auth_parameters() {
     assert_eq!(
         run_auth_test!("AWS4-HMAC-SHA256 "),
@@ -274,7 +274,7 @@ async fn test_missing_auth_parameters() {
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_missing_auth_signed_headers() {
     assert_eq!(
         run_auth_test!(
@@ -288,7 +288,7 @@ Signature=c9d5ea9f3f72853aea855b47ea873832890dbdd183b4468f858259531a5138ea"
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_missing_auth_credential() {
     assert_eq!(
         run_auth_test!(
@@ -302,7 +302,7 @@ Signature=c9d5ea9f3f72853aea855b47ea873832890dbdd183b4468f858259531a5138ea"
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_duplicate_auth_credential() {
     assert_eq!(
         run_auth_test!(
@@ -318,7 +318,7 @@ Signature=c9d5ea9f3f72853aea855b47ea873832890dbdd183b4468f858259531a5138ea"
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_missing_auth_signature() {
     assert_eq!(
         run_auth_test!(
@@ -332,7 +332,7 @@ SignedHeaders=host;x-amz-date"
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_missing_auth_eq() {
     assert_eq!(
         run_auth_test!(
@@ -347,7 +347,7 @@ Signature=c9d5ea9f3f72853aea855b47ea873832890dbdd183b4468f858259531a5138ea"
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_noncanonical_signed_headers() {
     assert_eq!(
         run_auth_test!(
@@ -361,13 +361,13 @@ Signature=c9d5ea9f3f72853aea855b47ea873832890dbdd183b4468f858259531a5138ea"
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_wrong_auth_algorithm() {
     assert_eq!(run_auth_test_expect_kind!("AWS3-ZZZ Credential=12345", MissingHeader), "Missing header: authorization");
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn test_multiple_algorithms() {
     let mut headers = HeaderMap::<HeaderValue>::with_capacity(2);
     headers.append("authorization", HeaderValue::from_static("Basic foobar"));
@@ -391,7 +391,7 @@ async fn test_multiple_algorithms() {
 }
 
 #[tokio::test]
-#[test_env_log::test]
+#[test_log::test]
 async fn duplicate_query_parameter() {
     let headers = HeaderMap::new();
 
@@ -410,7 +410,7 @@ async fn duplicate_query_parameter() {
 }
 
 #[test]
-#[test_env_log::test]
+#[test_log::test]
 fn missing_header() {
     let mut headers = HeaderMap::<HeaderValue>::with_capacity(1);
     headers.insert("authorization", HeaderValue::from_static(""));
@@ -426,7 +426,7 @@ fn missing_header() {
 }
 
 #[test]
-#[test_env_log::test]
+#[test_log::test]
 fn missing_date() {
     let mut headers = HeaderMap::<HeaderValue>::with_capacity(2);
     headers.insert("authorization", HeaderValue::from_static(_AUTH_HEADER1));
@@ -444,7 +444,7 @@ fn missing_date() {
 }
 
 #[test]
-#[test_env_log::test]
+#[test_log::test]
 fn invalid_date() {
     let mut headers = HeaderMap::<HeaderValue>::with_capacity(2);
     headers.insert("authorization", HeaderValue::from_static(_AUTH_HEADER1));

hyper-integration/Cargo.toml

@@ -30,4 +30,4 @@ hyper = { version = "^0.14", features = [ "client", "server", "stream", "tcp", "
 rusoto_core = "^0.46"
 rusoto_credential = "^0.46"
 rusoto_signature = "^0.46"
-test-env-log = "^0.2"
+test-log = "^0.2"

hyper-integration/src/lib.rs

@@ -33,7 +33,7 @@ mod tests {
     use tokio;
     use tower::{BoxError, Service};
 
-    #[test_env_log::test(tokio::test)]
+    #[test_log::test(tokio::test)]
     async fn test_fn_wrapper() {
         let sigfn = get_signing_key_fn(get_creds_fn);
         let wrapped = service_fn(hello_response);
@@ -90,7 +90,7 @@ mod tests {
         }
     }
 
-    #[test_env_log::test(tokio::test)]
+    #[test_log::test(tokio::test)]
     async fn test_svc_wrapper() {
         let make_svc = SpawnDummyHelloService {};
         let server = Server::bind(&SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::LOCALHOST, 5938, 0, 0))).serve(make_svc);
@@ -145,7 +145,7 @@ mod tests {
         assert_eq!(status, StatusCode::OK);
     }
 
-    #[test_env_log::test(tokio::test)]
+    #[test_log::test(tokio::test)]
     async fn test_svc_wrapper_bad_creds() {
         let make_svc = SpawnDummyHelloService {};
         let server = Server::bind(&SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::LOCALHOST, 5939, 0, 0))).serve(make_svc);