Skip to content

Commit 0a17b58

Browse files
committed
Set mergeable_state to unknown in tester.push_to_pr(...)
1 parent 5e2e772 commit 0a17b58

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/bors/handlers/pr_events.rs

-5
Original file line numberDiff line numberDiff line change
@@ -575,11 +575,6 @@ mod tests {
575575
#[sqlx::test]
576576
async fn enqueue_prs_on_push_to_pr(pool: sqlx::PgPool) {
577577
run_test(pool, |mut tester| async {
578-
tester
579-
.default_repo()
580-
.lock()
581-
.get_pr_mut(default_pr_number())
582-
.mergeable_state = OctocrabMergeableState::Unknown;
583578
tester
584579
.push_to_pr(default_repo_name(), default_pr_number())
585580
.await?;

src/tests/mocks/bors.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use tower::Service;
1414

1515
use crate::bors::mergeable_queue::MergeableQueueSender;
1616
use crate::bors::{RollupMode, WAIT_FOR_REFRESH};
17-
use crate::database::{BuildStatus, DelegatedPermission, PullRequestModel};
17+
use crate::database::{BuildStatus, DelegatedPermission, PullRequestModel, OctocrabMergeableState};
1818
use crate::github::api::load_repositories;
1919
use crate::github::server::BorsProcess;
2020
use crate::github::{GithubRepoName, PullRequestNumber};
@@ -510,6 +510,7 @@ impl BorsTester {
510510
.get_mut(&pr_number)
511511
.expect("PR must be initialized before pushing to it");
512512
pr.head_sha = format!("pr-{pr_number}-commit-{counter}");
513+
pr.mergeable_state = OctocrabMergeableState::Unknown;
513514
pr.clone()
514515
};
515516

0 commit comments

Comments
 (0)