|
1 | 1 | use std::{
|
2 | 2 | sync::{Arc, Mutex},
|
3 | 3 | thread,
|
| 4 | + time::Duration, |
4 | 5 | };
|
5 | 6 |
|
6 | 7 | use rustygear::client::{Client, WorkUpdate};
|
7 | 8 | use rustygeard::testutil::start_test_server;
|
| 9 | +use tokio::time::timeout; |
8 | 10 | use uuid::Uuid;
|
9 | 11 |
|
10 | 12 | #[test]
|
@@ -68,8 +70,14 @@ async fn test_server_coalesces_uniqs() {
|
68 | 70 | .await
|
69 | 71 | .expect("Submitting uniqid1 on client2");
|
70 | 72 | tx.send(()).await.expect("Sending to let the worker finish");
|
71 |
| - let response1 = job1.response().await.expect("Getting response to job1"); |
72 |
| - let response2 = job2.response().await.expect("Getting response to job2"); |
| 73 | + let response1 = timeout(Duration::from_millis(1000), job1.response()) |
| 74 | + .await |
| 75 | + .expect("response1 timeout") |
| 76 | + .expect("Getting response to job1"); |
| 77 | + let response2 = timeout(Duration::from_millis(1000), job2.response()) |
| 78 | + .await |
| 79 | + .expect("reponse2 timeout") |
| 80 | + .expect("Getting response to job2"); |
73 | 81 | if let WorkUpdate::Complete {
|
74 | 82 | handle: handle1,
|
75 | 83 | payload: payload1,
|
@@ -99,8 +107,14 @@ async fn test_server_coalesces_uniqs() {
|
99 | 107 | .expect("submitting uniqid2b job");
|
100 | 108 | tx.send(()).await.expect("Sending to let the worker finish");
|
101 | 109 | tx.send(()).await.expect("Sending to let the worker finish");
|
102 |
| - let response1b = job1b.response().await.expect("Getting response from job1b"); |
103 |
| - let response2b = job2b.response().await.expect("Getting response from job2b"); |
| 110 | + let response1b = timeout(Duration::from_millis(1000), job1b.response()) |
| 111 | + .await |
| 112 | + .expect("response1b timeout") |
| 113 | + .expect("Getting response from job1b"); |
| 114 | + let response2b = timeout(Duration::from_millis(1000), job2b.response()) |
| 115 | + .await |
| 116 | + .expect("response2b timeout") |
| 117 | + .expect("Getting response from job2b"); |
104 | 118 | if let WorkUpdate::Complete {
|
105 | 119 | handle: handle1b,
|
106 | 120 | payload: _,
|
|
0 commit comments