Merge pull request #311 from junpataleta/avoidRebaseFailInTests

Prevent merge conflicts test from failing due to a rebase warning/error
moodlehq · Oct 10, 2024 · 31c2186 · 31c2186
2 parents 9d014b0 + 08044e0
commit 31c2186
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tests/remote_branch_checker.bats b/tests/remote_branch_checker.bats
@@ -182,6 +182,8 @@ assert_prechecker () {
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: verify that merge conflicts are properly reported" {
+    export rebasewarn=999999 # Dont' warn about rebase ever.
+    export rebaseerror=999999 # Don't fail about rebase ever.
     export branch="local_ci_fixture_merge_conflict"
     export issue="MDL-12345"
     export integrateto=MOODLE_404_STABLE