Skip to content

Commit

Permalink
Merge branch 'main' into dl-dup-blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
mattsse committed Jul 7, 2023
2 parents a5b49ca + 526f624 commit f83b85b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/net/network/tests/it/connect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ async fn test_connect_to_trusted_peer() {

#[tokio::test(flavor = "multi_thread")]
#[serial_test::serial]
#[cfg_attr(not(feature = "geth-tests"), ignore)]
#[ignore] // TODO: Re-enable once we figure out why this test is flakey
async fn test_incoming_node_id_blacklist() {
reth_tracing::init_test_tracing();
tokio::time::timeout(GETH_TIMEOUT, async move {
Expand Down

0 comments on commit f83b85b

Please sign in to comment.