Merge pull request #1473 from umireon/umireon-fix-cask-tests

brew-cask tests never fail on BrewTestBot

1 files changed, 6 insertions, 2 deletions

diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
index 3126490e3..0bfc4b037 100755
--- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb
+++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
@@ -26,6 +26,8 @@ repo_root.cd do
 
   ENV["HOMEBREW_TESTS_COVERAGE"] = "1" if ARGV.flag?("--coverage")
 
+  failed = false
+
   if rspec
     run_tests "parallel_rspec", Dir["spec/**/*_spec.rb"], %w[
       --color
@@ -34,15 +36,17 @@ repo_root.cd do
       --format ParallelTests::RSpec::RuntimeLogger
       --out tmp/parallel_runtime_rspec.log
     ]
+    failed ||= !$CHILD_STATUS.success?
   end
 
   if minitest
     run_tests "parallel_test", Dir["test/**/*_test.rb"]
+    failed ||= !$CHILD_STATUS.success?
   end
 
+  Homebrew.failed = failed
+
   if ENV["CODECOV_TOKEN"]
     system "bundle", "exec", "rake", "test:coverage:upload"
   end
-
-  Homebrew.failed = !$CHILD_STATUS.success?
 end