Merge pull request #362 from Kobzol/test-suite-refactor

Refactor test suite to handle timeouts in a more robust way

Author: Kobzol

src/bors/handlers/help.rs

@@ -83,7 +83,7 @@ mod tests {
 
     #[sqlx::test]
     async fn help_command(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors help").await?;
             insta::assert_snapshot!(tester.get_comment().await?, @r"
             You can use the following commands:
@@ -119,7 +119,7 @@ mod tests {
             - `ping`: Check if the bot is alive
             - `help`: Print this help message
             ");
-            Ok(tester)
+            Ok(())
         })
         .await;
     }

src/bors/handlers/info.rs

@@ -64,7 +64,7 @@ mod tests {
 
     #[sqlx::test]
     async fn info_for_unapproved_pr(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors info").await?;
             insta::assert_snapshot!(
                 tester.get_comment().await?,
@@ -75,14 +75,14 @@ mod tests {
             - Mergeable: yes
             "
             );
-            Ok(tester)
+            Ok(())
         })
         .await;
     }
 
     #[sqlx::test]
     async fn info_for_approved_pr(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors r+").await?;
             tester.expect_comments(1).await;
 
@@ -96,14 +96,14 @@ mod tests {
             - Mergeable: yes
             "
             );
-            Ok(tester)
+            Ok(())
         })
         .await;
     }
 
     #[sqlx::test]
     async fn info_for_pr_with_priority(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors p=5").await?;
             tester
                 .wait_for_default_pr(|pr| pr.priority == Some(5))
@@ -119,14 +119,14 @@ mod tests {
             - Mergeable: yes
             "
             );
-            Ok(tester)
+            Ok(())
         })
         .await;
     }
 
     #[sqlx::test]
     async fn info_for_pr_with_try_build(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors try").await?;
             tester.expect_comments(1).await;
 
@@ -141,14 +141,14 @@ mod tests {
             - Try build is in progress
             "
             );
-            Ok(tester)
+            Ok(())
         })
         .await;
     }
 
     #[sqlx::test]
     async fn info_for_pr_with_everything(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors r+ p=10").await?;
             tester.expect_comments(1).await;
 
@@ -171,7 +171,7 @@ mod tests {
             	- Workflow URL: https://github.com/workflows/Workflow1/1
             "
             );
-            Ok(tester)
+            Ok(())
         })
         .await;
     }

src/bors/handlers/mod.rs

@@ -636,32 +636,32 @@ mod tests {
 
     #[sqlx::test]
     async fn ignore_bot_comment(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester
                 .post_comment(Comment::from("@bors ping").with_author(User::bors_bot()))
                 .await?;
             // Returning here will make sure that no comments were received
-            Ok(tester)
+            Ok(())
         })
         .await;
     }
 
     #[sqlx::test]
     async fn do_not_load_pr_on_unrelated_comment(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.default_repo().lock().pull_request_error = true;
             tester.post_comment("no command").await?;
-            Ok(tester)
+            Ok(())
         })
         .await;
     }
 
     #[sqlx::test]
     async fn unknown_command(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment(Comment::from("@bors foo")).await?;
             insta::assert_snapshot!(tester.get_comment().await?, @r#"Unknown command "foo". Run `@bors help` to see available commands."#);
-            Ok(tester)
+            Ok(())
         })
         .await;
     }

src/bors/handlers/ping.rs

@@ -20,10 +20,10 @@ mod tests {
 
     #[sqlx::test]
     async fn ping_command(pool: sqlx::PgPool) {
-        run_test(pool, |mut tester| async {
+        run_test(pool, async |tester| {
             tester.post_comment("@bors ping").await?;
             assert_eq!(tester.get_comment().await?, "Pong 🏓!");
-            Ok(tester)
+            Ok(())
         })
         .await;
     }