zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use an OS-assigned port in the non-blocking logger test's zebrad testchild config and read the RPC port from Zebra's logs (#8658) 

Co-authored-by: Pili Guerra <mpguerra@users.noreply.github.com>
This commit is contained in:
Arya 2024-07-08 06:47:49 -04:00 committed by GitHub
parent 0d8b10b95f
commit 09935bb433
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebrad/tests/acceptance.rs
View File

@ -1711,12 +1711,9 @@ fn non_blocking_logger() -> Result<()> {
let test_task_handle: tokio::task::JoinHandle<Result<()>> = rt.spawn(async move { let test_task_handle: tokio::task::JoinHandle<Result<()>> = rt.spawn(async move {
let _init_guard = zebra_test::init(); let _init_guard = zebra_test::init();
// Write a configuration that has RPC listen_addr set let mut config = os_assigned_rpc_port_config(false, &Mainnet)?;
// [Note on port conflict](#Note on port conflict)
let mut config = random_known_rpc_port_config(false, &Mainnet)?;
config.tracing.filter = Some("trace".to_string()); config.tracing.filter = Some("trace".to_string());
config.tracing.buffer_limit = 100; config.tracing.buffer_limit = 100;
let zebra_rpc_address = config.rpc.listen_addr.unwrap();
let dir = testdir()?.with_config(&mut config)?; let dir = testdir()?.with_config(&mut config)?;
let mut child = dir let mut child = dir
@ -1724,12 +1721,10 @@ fn non_blocking_logger() -> Result<()> {
.with_timeout(TINY_CHECKPOINT_TIMEOUT); .with_timeout(TINY_CHECKPOINT_TIMEOUT);
// Wait until port is open. // Wait until port is open.
child.expect_stdout_line_matches( let rpc_address = read_listen_addr_from_logs(&mut child, OPENED_RPC_ENDPOINT_MSG)?;
format!("Opened RPC endpoint at {}", config.rpc.listen_addr.unwrap()).as_str(),
)?;
// Create an http client // Create an http client
let client = RpcRequestClient::new(zebra_rpc_address); let client = RpcRequestClient::new(rpc_address);
// Most of Zebra's lines are 100-200 characters long, so 500 requests should print enough to fill the unix pipe, // Most of Zebra's lines are 100-200 characters long, so 500 requests should print enough to fill the unix pipe,
// fill the channel that tracing logs are queued onto, and drop logs rather than block execution. // fill the channel that tracing logs are queued onto, and drop logs rather than block execution.