Merge pull request #524 from Kobzol/label-opt-test

Add test for label optimization

Author: Kobzol

src/bors/handlers/review.rs

@@ -521,6 +521,35 @@ mod tests {
         .await;
     }
 
+    #[sqlx::test]
+    async fn approve_do_not_unnecessarily_modify_labels(pool: sqlx::PgPool) {
+        let gh = GitHub::default().with_default_config(
+            r#"
+[labels]
+approved = ["+foo", "+baz", "-bar", "-foo2"]
+"#,
+        );
+        run_test((pool, gh), async |ctx: &mut BorsTester| {
+            let pr = ctx
+                .open_pr((), |pr| {
+                    pr.labels.push("foo".to_string());
+                    pr.labels.push("foo2".to_string());
+                })
+                .await?;
+            ctx.post_comment(Comment::new(pr.id(), "@bors r+")).await?;
+            ctx.expect_comments(pr.id(), 1).await;
+
+            // Do not add already present labels
+            // Do not remove non-present labels
+            ctx.pr(pr.id())
+                .await
+                .expect_added_labels(&["baz"])
+                .expect_removed_labels(&["foo2"]);
+            Ok(())
+        })
+        .await;
+    }
+
     #[sqlx::test]
     async fn unapprove(pool: sqlx::PgPool) {
         run_test(pool, async |ctx: &mut BorsTester| {

src/bors/handlers/trybuild.rs

@@ -288,8 +288,8 @@ mod tests {
     use crate::github::CommitSha;
     use crate::github::api::client::HideCommentReason;
     use crate::tests::default_repo_name;
-    use crate::tests::{BorsBuilder, Comment, GitHub, User, WorkflowEvent, run_test};
     use crate::tests::{BorsTester, Branch, Commit};
+    use crate::tests::{Comment, GitHub, User, WorkflowEvent, run_test};
     use octocrab::params::checks::{CheckRunConclusion, CheckRunStatus};
 
     #[sqlx::test]
@@ -839,30 +839,29 @@ try-job: Bar
 
     #[sqlx::test]
     async fn try_build_failed_modify_labels(pool: sqlx::PgPool) {
-        BorsBuilder::new(pool)
-            .github(GitHub::default().with_default_config(
-                r#"
+        let gh = GitHub::default().with_default_config(
+            r#"
 [labels]
 try_failed = ["+foo", "+bar", "-baz"]
 "#,
-            ))
-            .run_test(async |ctx: &mut BorsTester| {
-                ctx.post_comment("@bors try").await?;
-                insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @r"
+        );
+        run_test((pool, gh), async |ctx: &mut BorsTester| {
+            ctx.post_comment("@bors try").await?;
+            insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @r"
                 :hourglass: Trying commit pr-1-sha with merge merge-0-pr-1…
 
                 To cancel the try build, run the command `@bors try cancel`.
                 ");
-                ctx.pr(()).await.expect_added_labels(&[]);
-                ctx.workflow_full_failure(ctx.try_workflow()).await?;
-                ctx.expect_comments((), 1).await;
-                ctx.pr(())
-                    .await
-                    .expect_added_labels(&["foo", "bar"])
-                    .expect_removed_labels(&["baz"]);
-                Ok(())
-            })
-            .await;
+            ctx.pr(()).await.expect_added_labels(&[]);
+            ctx.workflow_full_failure(ctx.try_workflow()).await?;
+            ctx.expect_comments((), 1).await;
+            ctx.pr(())
+                .await
+                .expect_added_labels(&["foo", "bar"])
+                .expect_removed_labels(&["baz"]);
+            Ok(())
+        })
+        .await;
     }
 
     #[sqlx::test]