瀏覽代碼

tcp/tests: make sure line number in recv_nothing points to the test code.

Dario Nieuwenhuis 5 月之前
父節點
當前提交
91661eed84
共有 1 個文件被更改,包括 11 次插入4 次删除
  1. 11 4
      src/socket/tcp.rs

+ 11 - 4
src/socket/tcp.rs

@@ -2806,11 +2806,14 @@ mod test {
     fn recv_nothing(socket: &mut TestSocket, timestamp: Instant) {
     fn recv_nothing(socket: &mut TestSocket, timestamp: Instant) {
         socket.cx.set_now(timestamp);
         socket.cx.set_now(timestamp);
 
 
-        let result: Result<(), ()> = socket
-            .socket
-            .dispatch(&mut socket.cx, |_, (_ip_repr, _tcp_repr)| {
+        let mut fail = false;
+        let result: Result<(), ()> = socket.socket.dispatch(&mut socket.cx, |_, _| {
+            fail = true;
+            Ok(())
+        });
+        if fail {
                 panic!("Should not send a packet")
                 panic!("Should not send a packet")
-            });
+        }
 
 
         assert_eq!(result, Ok(()))
         assert_eq!(result, Ok(()))
     }
     }
@@ -2833,6 +2836,10 @@ mod test {
             $( recv!($socket, Ok($repr)); )*
             $( recv!($socket, Ok($repr)); )*
             recv_nothing!($socket)
             recv_nothing!($socket)
         });
         });
+        ($socket:ident, time $time:expr, [$( $repr:expr ),*]) => ({
+            $( recv!($socket, time $time, Ok($repr)); )*
+            recv_nothing!($socket, time $time)
+        });
         ($socket:ident, $result:expr) =>
         ($socket:ident, $result:expr) =>
             (recv!($socket, time 0, $result));
             (recv!($socket, time 0, $result));
         ($socket:ident, time $time:expr, $result:expr) =>
         ($socket:ident, time $time:expr, $result:expr) =>