File tree Expand file tree Collapse file tree 1 file changed +7
-12
lines changed
compiler/base/orchestrator/src Expand file tree Collapse file tree 1 file changed +7
-12
lines changed Original file line number Diff line number Diff line change @@ -1441,8 +1441,6 @@ mod tests {
1441
1441
use futures:: { future:: try_join_all, Future , FutureExt } ;
1442
1442
use std:: { sync:: Once , time:: Duration } ;
1443
1443
use tempdir:: TempDir ;
1444
- use tokio:: join;
1445
- use tokio_stream:: { wrappers:: ReceiverStream , StreamExt } ;
1446
1444
1447
1445
use super :: * ;
1448
1446
@@ -1776,16 +1774,13 @@ mod tests {
1776
1774
stderr_rx,
1777
1775
} = coordinator. begin_compile ( req) . await . unwrap ( ) ;
1778
1776
1779
- let stdout = ReceiverStream :: new ( stdout_rx) ;
1780
- let stdout = stdout. collect :: < String > ( ) ;
1781
-
1782
- let stderr = ReceiverStream :: new ( stderr_rx) ;
1783
- let stderr = stderr. collect :: < String > ( ) ;
1784
-
1785
- let ( complete, _stdout, stderr) =
1786
- async { join ! ( task, stdout, stderr) } . with_timeout ( ) . await ;
1787
-
1788
- let response = complete. unwrap ( ) ;
1777
+ let WithOutput {
1778
+ response,
1779
+ stdout : _,
1780
+ stderr,
1781
+ } = WithOutput :: try_absorb ( task, stdout_rx, stderr_rx)
1782
+ . await
1783
+ . unwrap ( ) ;
1789
1784
1790
1785
assert ! ( response. success, "stderr: {}" , stderr) ;
1791
1786
assert_contains ! ( stderr, "Compiling" ) ;
You can’t perform that action at this time.
0 commit comments