rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tolerate more timing issues in SSE heartbeat test.

This commit is contained in:
Sergio Benitez 2022-05-23 16:15:01 -07:00
parent 9b3c83eb70
commit 907af10ea4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/lib/src/response/stream/sse.rs
View File

@ -777,29 +777,30 @@ mod sse_tests {
assert!(heartbeats >= 2 && heartbeats <= 4, "got {} beat(s)", heartbeats); assert!(heartbeats >= 2 && heartbeats <= 4, "got {} beat(s)", heartbeats);
let stream = EventStream! { let stream = EventStream! {
time::sleep(Duration::from_millis(200)).await; time::sleep(Duration::from_millis(250)).await;
yield Event::data("foo"); yield Event::data("foo");
time::sleep(Duration::from_millis(200)).await; time::sleep(Duration::from_millis(250)).await;
yield Event::data("bar"); yield Event::data("bar");
}; };
let string = stream.heartbeat(Duration::from_millis(300)).into_string(); // We expect: foo\n\n [heartbeat] bar\n\n [maybe beartbeat].
let string = stream.heartbeat(Duration::from_millis(350)).into_string();
let heartbeats = string.matches(HEARTBEAT).count(); let heartbeats = string.matches(HEARTBEAT).count();
assert!(heartbeats >= 1 && heartbeats <= 3, "got {} beat(s)", heartbeats); assert!(heartbeats >= 1 && heartbeats <= 3, "got {} beat(s)", heartbeats);
assert!(string.contains("data:foo\n\n")); assert!(string.contains("data:foo\n\n"), "string = {:?}", string);
assert!(string.contains("data:bar\n\n")); assert!(string.contains("data:bar\n\n"), "string = {:?}", string);
// We shouldn't send a heartbeat if a message is immediately available. // We shouldn't send a heartbeat if a message is immediately available.
let stream = EventStream::from(once(ready(Event::data("hello")))); let stream = EventStream::from(once(ready(Event::data("hello"))));
let string = stream.heartbeat(Duration::from_secs(1)).into_string(); let string = stream.heartbeat(Duration::from_secs(1)).into_string();
assert_eq!(string, "data:hello\n\n"); assert_eq!(string, "data:hello\n\n", "string = {:?}", string);
// It's okay if we do it with two, though. // It's okay if we do it with two, though.
let stream = EventStream::from(iter(vec![Event::data("a"), Event::data("b")])); let stream = EventStream::from(iter(vec![Event::data("a"), Event::data("b")]));
let string = stream.heartbeat(Duration::from_secs(1)).into_string(); let string = stream.heartbeat(Duration::from_secs(1)).into_string();
let heartbeats = string.matches(HEARTBEAT).count(); let heartbeats = string.matches(HEARTBEAT).count();
assert!(heartbeats <= 1); assert!(heartbeats <= 1);
assert!(string.contains("data:a\n\n")); assert!(string.contains("data:a\n\n"), "string = {:?}", string);
assert!(string.contains("data:b\n\n")); assert!(string.contains("data:b\n\n"), "string = {:?}", string);
} }
} }