substrate runner: increase line read + dump CLI output if parsing fails (#1781)

* substrate runner: dump CLI output parsing fails

* cargo fmt

* Update testing/substrate-runner/src/lib.rs

* fix grumbles

* disable flaky test

* ignore reconn test too

* ignore more tests

* fix tests

* improve log parsing

* Update testing/integration-tests/src/full_client/client/unstable_rpcs.rs

* Update testing/integration-tests/src/full_client/client/unstable_rpcs.rs

* fix nits

* fix reconn test
This commit is contained in:
Niklas Adolfsson
2024-09-24 15:33:08 +02:00
committed by GitHub
parent b25d56f3d1
commit 9db5a39013
9 changed files with 130 additions and 48 deletions
@@ -2,7 +2,7 @@
// This file is dual-licensed as Apache-2.0 or GPL-3.0.
// see LICENSE for license details.
use crate::{subxt_test, test_context};
use crate::{subxt_test, test_context, utils::consume_initial_blocks};
use codec::{Compact, Encode};
use futures::StreamExt;
@@ -94,6 +94,7 @@ async fn finalized_headers_subscription() -> Result<(), subxt::Error> {
let api = ctx.client();
let mut sub = api.blocks().subscribe_finalized().await?;
consume_initial_blocks(&mut sub).await;
// check that the finalized block reported lines up with the `latest_finalized_block_ref`.
for _ in 0..2 {
@@ -420,29 +420,28 @@ async fn legacy_and_unstable_block_subscription_reconnect() {
let api = api.clone();
async move {
let mut missed_blocks = false;
(api.blocks()
.subscribe_finalized()
.await
.unwrap()
// Ignore `disconnected events`.
// This will be emitted by the legacy backend for every reconnection.
.filter(|item| {
let disconnected = match item {
Ok(_) => false,
Err(e) => {
if matches!(e, Error::Rpc(subxt::error::RpcError::DisconnectedWillReconnect(e)) if e.contains("Missed at least one block when the connection was lost")) {
missed_blocks = true;
}
e.is_disconnected_will_reconnect()
}
};
futures::future::ready(!disconnected)
})
.take(num)
.map(|x| x.unwrap().hash().to_string())
.collect::<Vec<String>>()
.await, missed_blocks)
let blocks =
// Ignore `disconnected events`.
// This will be emitted by the legacy backend for every reconnection.
api.blocks().subscribe_finalized().await.unwrap().filter(|item| {
let disconnected = match item {
Ok(_) => false,
Err(e) => {
if matches!(e, Error::Rpc(subxt::error::RpcError::DisconnectedWillReconnect(e)) if e.contains("Missed at least one block when the connection was lost")) {
missed_blocks = true;
}
e.is_disconnected_will_reconnect()
}
};
futures::future::ready(!disconnected)
})
.take(num)
.map(|x| x.unwrap().hash().to_string())
.collect::<Vec<String>>().await;
(blocks, missed_blocks)
}
};
@@ -5,7 +5,10 @@
//! Just sanity checking some of the new RPC methods to try and
//! catch differences as the implementations evolve.
use crate::{subxt_test, test_context, utils::node_runtime};
use crate::{
subxt_test, test_context,
utils::{consume_initial_blocks, node_runtime},
};
use assert_matches::assert_matches;
use codec::Encode;
use futures::Stream;
@@ -341,8 +344,11 @@ async fn transaction_v1_broadcast() {
// Subscribe to finalized blocks.
let mut finalized_sub = api.blocks().subscribe_finalized().await.unwrap();
consume_initial_blocks(&mut finalized_sub).await;
// Expect the tx to be encountered in a maximum number of blocks.
let mut num_blocks: usize = 10;
let mut num_blocks: usize = 20;
// Submit the transaction.
let _operation_id = rpc