brew-test-bot: always force uninstall.

Also filter the force flag from pretty output.

Closes Homebrew/homebrew#20988.

1 files changed, 5 insertions, 5 deletions

diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index ae5ed0cb4..7b66ddd33 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -50,7 +50,7 @@ class Step
   end
 
   def command_short
-    @command.gsub(/(brew|--verbose|--build-bottle) /, '')
+    @command.gsub(/(brew|--force|--verbose|--build-bottle) /, '')
   end
 
   def passed?
@@ -256,7 +256,7 @@ class Test
     test "brew audit #{formula}"
     test "brew fetch #{dependencies}" unless dependencies.empty?
     test "brew fetch --force --build-bottle #{formula}"
-    test "brew uninstall #{formula}" if formula_object.installed?
+    test "brew uninstall --force #{formula}" if formula_object.installed?
     test "brew install --verbose --build-bottle #{formula}"
     return unless steps.last.passed?
     bottle_step = test "brew bottle #{formula}", :puts_output_on_success => true
@@ -269,11 +269,11 @@ class Test
         file.write bottle_output
       end
     end
-    test "brew uninstall #{formula}"
+    test "brew uninstall --force #{formula}"
     test "brew install #{bottle_filename}"
     test "brew test #{formula}" if formula_object.test_defined?
-    test "brew uninstall #{formula}"
-    test "brew uninstall #{dependencies}" unless dependencies.empty?
+    test "brew uninstall --force #{formula}"
+    test "brew uninstall --force #{dependencies}" unless dependencies.empty?
   end
 
   def homebrew