From 516d744bdd92b58b193732ecd5b90e018465e317 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Mon, 19 Dec 2022 19:12:14 +0100
Subject: [PATCH] test: run geth tests in serial (#527)

---
 Cargo.lock                             | 39 ++++++++++++++++++++++++++
 crates/net/network/Cargo.toml          |  5 +++-
 crates/net/network/tests/it/connect.rs |  3 ++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 573fb37ce3..ea77871b12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -830,6 +830,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.12.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.5",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.3.3"
@@ -3578,6 +3591,7 @@ dependencies = [
  "reth-tracing",
  "reth-transaction-pool",
  "secp256k1",
+ "serial_test",
  "tempfile",
  "thiserror",
  "tokio",
@@ -4147,6 +4161,31 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serial_test"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c789ec87f4687d022a2405cf46e0cd6284889f1839de292cadeb6c6019506f2"
+dependencies = [
+ "dashmap",
+ "futures",
+ "lazy_static",
+ "log",
+ "parking_lot 0.12.1",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b64f9e531ce97c88b4778aad0ceee079216071cffec6ac9b904277f8f92e7fe3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml
index 33751dee37..4941293af4 100644
--- a/crates/net/network/Cargo.toml
+++ b/crates/net/network/Cargo.toml
@@ -53,8 +53,11 @@ reth-provider = { path = "../../storage/provider", features = ["test-utils"] }
 reth-tracing = { path = "../../tracing" }
 ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
 ethers-providers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+
 enr = { git = "https://github.com/sigp/enr", features = ["serde", "rust-secp256k1"] }
+
+# misc
 hex = "0.4"
 tempfile = "3.3"
-
+serial_test = "0.10"
 
diff --git a/crates/net/network/tests/it/connect.rs b/crates/net/network/tests/it/connect.rs
index 4e5683cd4a..f0a749a4a5 100644
--- a/crates/net/network/tests/it/connect.rs
+++ b/crates/net/network/tests/it/connect.rs
@@ -176,6 +176,7 @@ async fn test_incoming_node_id_blacklist() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
+#[serial_test::serial]
 async fn test_incoming_connect_with_single_geth() {
     reth_tracing::init_tracing();
     let secret_key = SecretKey::new(&mut rand::thread_rng());
@@ -217,6 +218,7 @@ async fn test_incoming_connect_with_single_geth() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
+#[serial_test::serial]
 async fn test_outgoing_connect_with_single_geth() {
     reth_tracing::init_tracing();
     let secret_key = SecretKey::new(&mut rand::thread_rng());
@@ -259,6 +261,7 @@ async fn test_outgoing_connect_with_single_geth() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
+#[serial_test::serial]
 async fn test_geth_disconnect() {
     reth_tracing::init_tracing();
     let secret_key = SecretKey::new(&mut rand::thread_rng());