Skip to content

Commit 1240fe8

Browse files
authored
test(core): await remote test server socket I/O (solana-foundation#874)
1 parent adbab21 commit 1240fe8

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

‎crates/core/src/surfnet/remote.rs‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -952,29 +952,26 @@ mod tests {
952952

953953
#[tokio::test(flavor = "multi_thread")]
954954
async fn a_remote_transaction_failure_does_not_disclose_datasource_credentials() {
955+
use tokio::io::{AsyncReadExt, AsyncWriteExt};
956+
955957
let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
956958
.await
957959
.expect("test server should bind");
958960
let address = listener
959961
.local_addr()
960962
.expect("test server should have a local address");
961963
let server = tokio::spawn(async move {
962-
let (stream, _) = listener.accept().await.expect("test server should accept");
964+
let (mut stream, _) = listener.accept().await.expect("test server should accept");
963965
let mut request = [0u8; 4096];
964-
stream
965-
.readable()
966+
let bytes_read = stream
967+
.read(&mut request)
966968
.await
967-
.expect("request stream should become readable");
968-
stream
969-
.try_read(&mut request)
970969
.expect("test server should read the request");
970+
assert!(bytes_read > 0, "test server should receive a request");
971971
let response = b"HTTP/1.1 401 Unauthorized\r\nContent-Length: 0\r\n\r\n";
972972
stream
973-
.writable()
973+
.write_all(response)
974974
.await
975-
.expect("response stream should become writable");
976-
stream
977-
.try_write(response)
978975
.expect("test server should write the response");
979976
});
980977
let datasource =

0 commit comments

Comments
 (0)