fix: test

veeso · May 20, 2024 · 0e53ebe · 0e53ebe
1 parent c97789c
commit 0e53ebe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 36 deletions.
diff --git a/suppaftp/src/async_ftp/mod.rs b/suppaftp/src/async_ftp/mod.rs
@@ -1153,15 +1153,10 @@ mod test {
             .await
             .unwrap();
         assert!(stream.login("test", "test").await.is_ok());
-        assert_eq!(
-            stream.get_welcome_msg().unwrap(),
-            r#"220---------- Welcome to Pure-FTPd [privsep] [TLS] ----------
-220-You are user number 3 of 5 allowed.
-220-Local time is now 08:30. Server port: 21.
-220-This is a private system - No anonymous login
-220-IPv6 connections are also welcome on this server.
-220 You will be disconnected after 15 minutes of inactivity."#
-        );
+        assert!(stream
+            .get_welcome_msg()
+            .unwrap()
+            .contains("220 You will be disconnected after 15 minutes of inactivity."));
     }
 
     #[async_attributes::test]
@@ -1170,15 +1165,10 @@ mod test {
     async fn welcome_message() {
         crate::log_init();
         let stream = setup_stream().await;
-        assert_eq!(
-            stream.get_welcome_msg().unwrap(),
-            r#"220---------- Welcome to Pure-FTPd [privsep] [TLS] ----------
-220-You are user number 3 of 5 allowed.
-220-Local time is now 08:30. Server port: 21.
-220-This is a private system - No anonymous login
-220-IPv6 connections are also welcome on this server.
-220 You will be disconnected after 15 minutes of inactivity."#
-        );
+        assert!(stream
+            .get_welcome_msg()
+            .unwrap()
+            .contains("220 You will be disconnected after 15 minutes of inactivity."));
         finalize_stream(stream).await;
     }
 

diff --git a/suppaftp/src/sync_ftp/mod.rs b/suppaftp/src/sync_ftp/mod.rs
@@ -1135,15 +1135,10 @@ mod test {
         let addr: SocketAddr = "127.0.0.1:10021".parse().expect("invalid hostname");
         let mut stream = FtpStream::connect_timeout(addr, Duration::from_secs(15)).unwrap();
         assert!(stream.login("test", "test").is_ok());
-        assert_eq!(
-            stream.get_welcome_msg().unwrap(),
-            r#"220---------- Welcome to Pure-FTPd [privsep] [TLS] ----------
-220-You are user number 3 of 5 allowed.
-220-Local time is now 08:30. Server port: 21.
-220-This is a private system - No anonymous login
-220-IPv6 connections are also welcome on this server.
-220 You will be disconnected after 15 minutes of inactivity."#
-        );
+        assert!(stream
+            .get_welcome_msg()
+            .unwrap()
+            .contains("220 You will be disconnected after 15 minutes of inactivity."));
     }
 
     #[test]
@@ -1152,15 +1147,10 @@ mod test {
     fn welcome_message() {
         crate::log_init();
         let stream: FtpStream = setup_stream();
-        assert_eq!(
-            stream.get_welcome_msg().unwrap(),
-            r#"220---------- Welcome to Pure-FTPd [privsep] [TLS] ----------
-220-You are user number 3 of 5 allowed.
-220-Local time is now 08:30. Server port: 21.
-220-This is a private system - No anonymous login
-220-IPv6 connections are also welcome on this server.
-220 You will be disconnected after 15 minutes of inactivity."#
-        );
+        assert!(stream
+            .get_welcome_msg()
+            .unwrap()
+            .contains("220 You will be disconnected after 15 minutes of inactivity."));
         finalize_stream(stream);
     }