test: ensure failed tests timeout

resolve a long standing test issue where failures to output the correct
message in the cli would result in the test never ending
rather than failing

the many test cases updated in this change are to ensure
failures are caught rather than ignored

some of them are just refactored to remove calling an extra function,
which is no longer needed

note: this doesn't fix the intermittent issue, most commonly experienced
under the nix configuration, where tests that should pass
occationally never end preventing the rest of the suite from running

6 files changed, 145 insertions, 252 deletions

diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 8a65d39..712753e 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -646,6 +646,22 @@ impl CliTester {
         }
     }
 
+    fn exp_string(&mut self, message: &str) -> Result<String> {
+        match self
+            .rexpect_session
+            .exp_string(message)
+            .context("expected immediate end but got timed out")
+        {
+            Ok(before) => Ok(before),
+            Err(e) => {
+                for p in [51, 52, 53, 55, 56, 57] {
+                    let _ = relay::shutdown_relay(8000 + p);
+                }
+                Err(e)
+            }
+        }
+    }
+
     /// returns what came before expected message
     pub fn expect_eventually<S>(&mut self, message: S) -> Result<String>
     where
@@ -653,10 +669,7 @@ impl CliTester {
     {
         let message_string = message.into();
         let message = message_string.as_str();
-        let before = self
-            .rexpect_session
-            .exp_string(message)
-            .context("exp_string failed")?;
+        let before = self.exp_string(message).context("exp_string failed")?;
         Ok(before)
     }
 
@@ -692,9 +705,24 @@ impl CliTester {
         Ok(self)
     }
 
+    fn exp_eof(&mut self) -> Result<String> {
+        match self
+            .rexpect_session
+            .exp_eof()
+            .context("expected immediate end but got timed out")
+        {
+            Ok(before) => Ok(before),
+            Err(e) => {
+                for p in [51, 52, 53, 55, 56, 57] {
+                    let _ = relay::shutdown_relay(8000 + p);
+                }
+                Err(e)
+            }
+        }
+    }
+
     pub fn expect_end(&mut self) -> Result<()> {
         let before = self
-            .rexpect_session
             .exp_eof()
             .context("expected immediate end but got timed out")?;
         ensure!(
@@ -709,7 +737,6 @@ impl CliTester {
 
     pub fn expect_end_with(&mut self, message: &str) -> Result<()> {
         let before = self
-            .rexpect_session
             .exp_eof()
             .context("expected immediate end but got timed out")?;
         assert_eq!(before, message);
@@ -718,7 +745,6 @@ impl CliTester {
 
     pub fn expect_end_eventually_and_print(&mut self) -> Result<()> {
         let before = self
-            .rexpect_session
             .exp_eof()
             .context("expected immediate end but got timed out")?;
         println!("ended eventually with:");
@@ -728,7 +754,6 @@ impl CliTester {
 
     pub fn expect_end_with_whitespace(&mut self) -> Result<()> {
         let before = self
-            .rexpect_session
             .exp_eof()
             .context("expected immediate end but got timed out")?;
         assert_eq!(before.trim(), "");
@@ -736,8 +761,7 @@ impl CliTester {
     }
 
     pub fn expect_end_eventually(&mut self) -> Result<String> {
-        self.rexpect_session
-            .exp_eof()
+        self.exp_eof()
             .context("expected end eventually but got timed out")
     }
 
diff --git a/tests/init.rs b/tests/init.rs
index 7c69784..2083c82 100644
--- a/tests/init.rs
+++ b/tests/init.rs
@@ -441,7 +441,9 @@ mod when_repo_not_previously_claimed {
         mod cli_ouput {
             use super::*;
 
-            async fn run_test_async() -> Result<()> {
+            #[tokio::test]
+            #[serial]
+            async fn check_cli_output() -> Result<()> {
                 let git_repo = prep_git_repo()?;
 
                 // fallback (51,52) user write (53, 55) repo (55, 56) blaster (57)
@@ -504,13 +506,6 @@ mod when_repo_not_previously_claimed {
                 cli_tester_handle.join().unwrap()?;
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn check_cli_output() -> Result<()> {
-                run_test_async().await?;
-                Ok(())
-            }
         }
     }
     // TODO: cli caputuring input
diff --git a/tests/list.rs b/tests/list.rs
index 6d161ea..7e12dc1 100644
--- a/tests/list.rs
+++ b/tests/list.rs
@@ -219,22 +219,19 @@ mod cannot_find_repo_event {
         #[tokio::test]
         #[serial]
         async fn warns_not_valid_input_and_asks_again() -> Result<()> {
-            let _ = run_async_repo_event_ref_needed(true, false, false).await;
-            Ok(())
+            run_async_repo_event_ref_needed(true, false, false).await
         }
 
         #[tokio::test]
         #[serial]
         async fn finds_based_on_nevent_on_embeded_relay() -> Result<()> {
-            let _ = run_async_repo_event_ref_needed(false, true, false).await;
-            Ok(())
+            run_async_repo_event_ref_needed(false, true, false).await
         }
 
         #[tokio::test]
         #[serial]
         async fn finds_based_on_naddr_on_embeded_relay() -> Result<()> {
-            let _ = run_async_repo_event_ref_needed(false, false, true).await;
-            Ok(())
+            run_async_repo_event_ref_needed(false, false, true).await
         }
     }
 }
@@ -327,7 +324,9 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -396,13 +395,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -517,7 +509,10 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -586,13 +581,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -713,7 +701,10 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -789,13 +780,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -922,7 +906,10 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -998,13 +985,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -1102,7 +1082,10 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -1176,13 +1159,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -1302,7 +1278,11 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn out_reflects_second_choice_discarding_old_and_applying_new()
+                    -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -1393,14 +1373,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn out_reflects_second_choice_discarding_old_and_applying_new()
-                    -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -1504,7 +1476,10 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -1583,13 +1558,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
@@ -1746,7 +1714,10 @@ mod when_main_branch_is_uptodate {
 
                 mod cli_prompts {
                     use super::*;
-                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                         let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                             Relay::new(8051, None, None),
                             Relay::new(8052, None, None),
@@ -1866,13 +1837,6 @@ mod when_main_branch_is_uptodate {
                         println!("{:?}", r55.events);
                         Ok(())
                     }
-
-                    #[tokio::test]
-                    #[serial]
-                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                        Ok(())
-                    }
                 }
 
                 #[tokio::test]
diff --git a/tests/pull.rs b/tests/pull.rs
index ee8cad1..77ff87b 100644
--- a/tests/pull.rs
+++ b/tests/pull.rs
@@ -127,7 +127,10 @@ mod when_main_is_checked_out {
 
     mod cli_prompts {
         use super::*;
-        async fn run_async_cli_show_error() -> Result<()> {
+
+        #[tokio::test]
+        #[serial]
+        async fn cli_show_error() -> Result<()> {
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                 Relay::new(8051, None, None),
                 Relay::new(8052, None, None),
@@ -174,12 +177,6 @@ mod when_main_is_checked_out {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn cli_show_error() -> Result<()> {
-            run_async_cli_show_error().await
-        }
     }
 }
 
@@ -188,7 +185,10 @@ mod when_branch_doesnt_exist {
 
     mod cli_prompts {
         use super::*;
-        async fn run_async_cli_show_error() -> Result<()> {
+
+        #[tokio::test]
+        #[serial]
+        async fn cli_show_error() -> Result<()> {
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                 Relay::new(8051, None, None),
                 Relay::new(8052, None, None),
@@ -239,12 +239,6 @@ mod when_branch_doesnt_exist {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn cli_show_error() -> Result<()> {
-            run_async_cli_show_error().await
-        }
     }
 }
 
@@ -256,7 +250,9 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_cli_show_up_to_date() -> Result<()> {
+            #[tokio::test]
+            #[serial]
+            async fn cli_show_up_to_date() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -304,12 +300,6 @@ mod when_branch_is_checked_out {
                 cli_tester_handle.join().unwrap()?;
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_show_up_to_date() -> Result<()> {
-                run_async_cli_show_up_to_date().await
-            }
         }
     }
 
@@ -368,7 +358,9 @@ mod when_branch_is_checked_out {
         mod cli_prompts {
             use super::*;
 
-            async fn run_async_cli_applied_1_commit() -> Result<()> {
+            #[tokio::test]
+            #[serial]
+            async fn cli_applied_1_commit() -> Result<()> {
                 // fallback (51,52) user write (53, 55) repo (55, 56)
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
@@ -419,12 +411,6 @@ mod when_branch_is_checked_out {
 
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_applied_1_commit() -> Result<()> {
-                run_async_cli_applied_1_commit().await
-            }
         }
 
         #[tokio::test]
@@ -444,7 +430,10 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+            #[tokio::test]
+            #[serial]
+            async fn cli_output_correct() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -509,13 +498,6 @@ mod when_branch_is_checked_out {
                 println!("{:?}", r55.events);
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_output_correct() -> Result<()> {
-                let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                Ok(())
-            }
         }
     }
 
@@ -524,7 +506,10 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+            #[tokio::test]
+            #[serial]
+            async fn cli_output_correct() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -589,13 +574,6 @@ mod when_branch_is_checked_out {
                 println!("{:?}", r55.events);
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_output_correct() -> Result<()> {
-                let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                Ok(())
-            }
         }
     }
 
@@ -659,7 +637,10 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+            #[tokio::test]
+            #[serial]
+            async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -711,13 +692,6 @@ mod when_branch_is_checked_out {
                 println!("{:?}", r55.events);
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                Ok(())
-            }
         }
 
         #[tokio::test]
@@ -835,7 +809,10 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+
+            #[tokio::test]
+            #[serial]
+            async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -928,13 +905,6 @@ mod when_branch_is_checked_out {
                 println!("{:?}", r55.events);
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
-                let _ = run_async_prompts_to_choose_from_proposal_titles().await;
-                Ok(())
-            }
         }
 
         #[tokio::test]
diff --git a/tests/push.rs b/tests/push.rs
index d295c01..db7a8b8 100644
--- a/tests/push.rs
+++ b/tests/push.rs
@@ -112,7 +112,10 @@ mod when_proposal_isnt_associated_with_branch_name {
     mod cli_prompts {
 
         use super::*;
-        async fn run_async_cli_show_error() -> Result<()> {
+
+        #[tokio::test]
+        #[serial]
+        async fn cli_show_error() -> Result<()> {
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                 Relay::new(8051, None, None),
                 Relay::new(8052, None, None),
@@ -163,12 +166,6 @@ mod when_proposal_isnt_associated_with_branch_name {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn cli_show_error() -> Result<()> {
-            run_async_cli_show_error().await
-        }
     }
 }
 
@@ -180,7 +177,9 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_cli_show_up_to_date() -> Result<()> {
+            #[tokio::test]
+            #[serial]
+            async fn cli_show_up_to_date() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -228,13 +227,6 @@ mod when_branch_is_checked_out {
                 cli_tester_handle.join().unwrap()?;
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_show_up_to_date() -> Result<()> {
-                let _ = run_async_cli_show_up_to_date().await;
-                Ok(())
-            }
         }
     }
 
@@ -243,7 +235,10 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_cli_shows_proposal_ahead_error() -> Result<()> {
+
+            #[tokio::test]
+            #[serial]
+            async fn cli_show_proposal_ahead_error() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -291,13 +286,6 @@ mod when_branch_is_checked_out {
                 cli_tester_handle.join().unwrap()?;
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_show_proposal_ahead_error() -> Result<()> {
-                let _ = run_async_cli_shows_proposal_ahead_error().await;
-                Ok(())
-            }
         }
     }
 
@@ -309,7 +297,9 @@ mod when_branch_is_checked_out {
 
             use super::*;
 
-            async fn run_async_cli_applied_1_commit() -> Result<()> {
+            #[tokio::test]
+            #[serial]
+            async fn cli_applied_1_commit() -> Result<()> {
                 // fallback (51,52) user write (53, 55) repo (55, 56)
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
@@ -392,13 +382,6 @@ mod when_branch_is_checked_out {
 
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_applied_1_commit() -> Result<()> {
-                let _ = run_async_cli_applied_1_commit().await;
-                Ok(())
-            }
         }
 
         async fn prep_and_run() -> Result<(GitTestRepo, Vec<nostr::Event>)> {
@@ -480,7 +463,10 @@ mod when_branch_is_checked_out {
 
         mod cli_prompts {
             use super::*;
-            async fn run_async_cli_shows_unpublished_rebase_error() -> Result<()> {
+
+            #[tokio::test]
+            #[serial]
+            async fn cli_shows_unpublished_rebase_error() -> Result<()> {
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                     Relay::new(8051, None, None),
                     Relay::new(8052, None, None),
@@ -533,20 +519,16 @@ mod when_branch_is_checked_out {
                 cli_tester_handle.join().unwrap()?;
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_shows_unpublished_rebase_error() -> Result<()> {
-                let _ = run_async_cli_shows_unpublished_rebase_error().await;
-                Ok(())
-            }
         }
         mod with_force_flag {
             use super::*;
 
             mod cli_prompts {
                 use super::*;
-                async fn run_async_cli_shows_revision_sent() -> Result<()> {
+
+                #[tokio::test]
+                #[serial]
+                async fn cli_shows_revision_sent() -> Result<()> {
                     let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
                         Relay::new(8051, None, None),
                         Relay::new(8052, None, None),
@@ -633,13 +615,6 @@ mod when_branch_is_checked_out {
                     cli_tester_handle.join().unwrap()?;
                     Ok(())
                 }
-
-                #[tokio::test]
-                #[serial]
-                async fn cli_shows_revision_sent() -> Result<()> {
-                    let _ = run_async_cli_shows_revision_sent().await;
-                    Ok(())
-                }
             }
         }
     }
diff --git a/tests/send.rs b/tests/send.rs
index 4e1adf4..3c619a4 100644
--- a/tests/send.rs
+++ b/tests/send.rs
@@ -696,7 +696,9 @@ mod sends_cover_letter_and_2_patches_to_3_relays {
     mod cli_ouput {
         use super::*;
 
-        async fn run_test_async() -> Result<()> {
+        #[tokio::test]
+        #[serial]
+        async fn check_cli_output() -> Result<()> {
             let git_repo = prep_git_repo()?;
 
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -765,13 +767,6 @@ mod sends_cover_letter_and_2_patches_to_3_relays {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn check_cli_output() -> Result<()> {
-            run_test_async().await?;
-            Ok(())
-        }
     }
 
     mod first_event_rejected_by_1_relay {
@@ -780,7 +775,9 @@ mod sends_cover_letter_and_2_patches_to_3_relays {
         mod only_first_rejected_event_sent_to_relay {
             use super::*;
 
-            async fn run_test_async() -> Result<()> {
+            #[tokio::test]
+            #[serial]
+            async fn only_first_rejected_event_sent_to_relay() -> Result<()> {
                 let git_repo = prep_git_repo()?;
 
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -847,19 +844,14 @@ mod sends_cover_letter_and_2_patches_to_3_relays {
 
                 Ok(())
             }
-
-            #[tokio::test]
-            #[serial]
-            async fn only_first_rejected_event_sent_to_relay() -> Result<()> {
-                run_test_async().await?;
-                Ok(())
-            }
         }
 
         mod cli_show_rejection_with_comment {
             use super::*;
 
-            async fn run_test_async() -> Result<(Relay<'static>, Relay<'static>, Relay<'static>)> {
+            #[tokio::test]
+            #[serial]
+            async fn cli_show_rejection_with_comment() -> Result<()> {
                 let git_repo = prep_git_repo()?;
 
                 let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -939,13 +931,6 @@ mod sends_cover_letter_and_2_patches_to_3_relays {
                     r56.listen_until_close(),
                 );
                 cli_tester_handle.join().unwrap()?;
-                Ok((r51, r52, r53))
-            }
-
-            #[tokio::test]
-            #[serial]
-            async fn cli_show_rejection_with_comment() -> Result<()> {
-                run_test_async().await?;
                 Ok(())
             }
         }
@@ -958,7 +943,9 @@ mod sends_2_patches_without_cover_letter {
     mod cli_ouput {
         use super::*;
 
-        async fn run_test_async() -> Result<()> {
+        #[tokio::test]
+        #[serial]
+        async fn check_cli_output() -> Result<()> {
             let git_repo = prep_git_repo()?;
 
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -1028,13 +1015,6 @@ mod sends_2_patches_without_cover_letter {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn check_cli_output() -> Result<()> {
-            run_test_async().await?;
-            Ok(())
-        }
     }
 
     #[tokio::test]
@@ -1239,7 +1219,9 @@ mod when_on_main_branch_defaults_to_last_commit {
     mod cli_ouput {
         use super::*;
 
-        async fn run_test_async() -> Result<()> {
+        #[tokio::test]
+        #[serial]
+        async fn check_cli_output() -> Result<()> {
             let git_repo = prep_git_repo()?;
 
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -1309,13 +1291,6 @@ mod when_on_main_branch_defaults_to_last_commit {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn check_cli_output() -> Result<()> {
-            run_test_async().await?;
-            Ok(())
-        }
     }
 
     #[tokio::test]
@@ -1431,7 +1406,9 @@ mod specify_starting_commits_whist_on_main_branch {
     mod cli_ouput {
         use super::*;
 
-        async fn run_test_async() -> Result<()> {
+        #[tokio::test]
+        #[serial]
+        async fn check_cli_output() -> Result<()> {
             let git_repo = prep_git_repo()?;
 
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -1501,13 +1478,6 @@ mod specify_starting_commits_whist_on_main_branch {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn check_cli_output() -> Result<()> {
-            run_test_async().await?;
-            Ok(())
-        }
     }
 
     #[tokio::test]
@@ -1691,7 +1661,9 @@ mod specify_in_reply_to {
     mod cli_ouput {
         use super::*;
 
-        async fn run_test_async() -> Result<()> {
+        #[tokio::test]
+        #[serial]
+        async fn check_cli_output() -> Result<()> {
             let git_repo = prep_git_repo()?;
 
             let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
@@ -1761,13 +1733,6 @@ mod specify_in_reply_to {
             cli_tester_handle.join().unwrap()?;
             Ok(())
         }
-
-        #[tokio::test]
-        #[serial]
-        async fn check_cli_output() -> Result<()> {
-            run_test_async().await?;
-            Ok(())
-        }
     }
 
     mod cover_letter_tags {