brew-test-bot: always force uninstall.

Also filter the force flag from pretty output.

Closes Homebrew/homebrew#20988.
This commit is contained in:
Mike McQuaid 2013-07-04 10:52:55 +01:00
parent ec50f2ed89
commit 6823020af7

View File

@ -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