fix: improve tests

conblem · Feb 10, 2021 · e24137f · e24137f
1 parent a69674c
commit e24137f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/api/proxy.rs b/src/api/proxy.rs
@@ -276,7 +276,7 @@ mod tests {
         let mut header = ppp::to_bytes(generate_ipv4()).unwrap();
         header.extend_from_slice("Test".as_ref());
 
-        let proxy_stream = &mut &mut header[..].source(ProxyProtocol::Enabled);
+        let proxy_stream = &mut &mut header.source(ProxyProtocol::Enabled);
 
         let actual = proxy_stream.real_addr().await.unwrap().unwrap();
 
@@ -304,7 +304,7 @@ mod tests {
     #[tokio::test]
     async fn test_failure() {
         let invalid = Vec::from("invalid header");
-        let invalid = &mut &mut invalid[..].source(ProxyProtocol::Enabled);
+        let invalid = &mut &mut invalid.source(ProxyProtocol::Enabled);
 
         let actual = invalid.real_addr().await.unwrap_err();
         assert_eq!(format!("{}", actual), "Proxy Parser Error");

diff --git a/src/config/records.rs b/src/config/records.rs
@@ -149,7 +149,7 @@ mod tests {
         #[serde(deserialize_with = "deserialize")] PreconfiguredRecords,
     );
 
-    fn _a_record_tokens() -> [Token; 8] {
+    fn a_record_tokens() -> [Token; 8] {
         [
             Token::BorrowedStr("acme.example.com"),
             Token::Map { len: Some(1) },
@@ -162,7 +162,7 @@ mod tests {
         ]
     }
 
-    fn _cname_record_tokens() -> [Token; 8] {
+    fn cname_record_tokens() -> [Token; 8] {
         [
             Token::BorrowedStr("acme.example.com"),
             Token::Map { len: Some(1) },
@@ -175,7 +175,7 @@ mod tests {
         ]
     }
 
-    fn _txt_record_tokens() -> [Token; 8] {
+    fn txt_record_tokens() -> [Token; 8] {
         [
             Token::BorrowedStr("acme.example.com"),
             Token::Map { len: Some(1) },
@@ -189,7 +189,9 @@ mod tests {
     }
 
     // todo: renable this test
-    fn _deserialize_test() {
+    #[test]
+    #[ignore]
+    fn deserialize_test() {
         let records = Default::default();
         let records = PreconfiguredRecordsWrapper(records);
 
@@ -200,9 +202,9 @@ mod tests {
             },
             Token::Map { len: Some(1) },
         ];
-        records_token.extend_from_slice(&_a_record_tokens());
-        records_token.extend_from_slice(&_cname_record_tokens());
-        records_token.extend_from_slice(&_txt_record_tokens());
+        records_token.extend_from_slice(&a_record_tokens());
+        records_token.extend_from_slice(&cname_record_tokens());
+        records_token.extend_from_slice(&txt_record_tokens());
         records_token.push(Token::MapEnd);
 
         assert_de_tokens(&records, &records_token)