From f6dad377b63946d403df7ed755fb14426a33df31 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 14 Jul 2016 14:37:50 +0100
Subject: [PATCH] test-bot: start running generic tests. (#505)
* test-bot: start running generic tests.
Start running the test suite in the "generic" mode i.e. a base layer for
non-OS X platforms to be able to use to ensure we don't break the generic code
for the parts of the code we've got running.
Currently this just runs the integration tests as that's the only useful suite
that's entirely passing but eventually this will be changed to run the full test
suite in generic mode.
* test_integration_cmds: fix tests on Linux.
---
Library/Homebrew/dev-cmd/test-bot.rb | 2 ++
Library/Homebrew/test/test_integration_cmds.rb | 7 ++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 52eb47cce1..7a9819dfaa 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -664,6 +664,8 @@ module Homebrew
tests_args << "--coverage" if ENV["TRAVIS"]
end
test "brew", "tests", *tests_args
+ test "brew", "tests", "--generic", "--only=integration_cmds",
+ *tests_args
test "brew", "tests", "--no-compat"
test "brew", "readall", "--syntax"
else
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 9353ce5f92..642fadf5f0 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -358,7 +358,7 @@ class IntegrationCommandTests < Homebrew::TestCase
def test_sh
assert_match "Your shell has been configured",
- cmd("sh", "SHELL" => "/usr/bin/true")
+ cmd("sh", "SHELL" => which("true"))
end
def test_info
@@ -588,10 +588,7 @@ class IntegrationCommandTests < Homebrew::TestCase
assert((share/"notpruneable").directory?)
refute((share/"pruneable_symlink").symlink?)
- # Inexact match because only if ~/Applications exists, will this output one
- # more line with contents `No apps unlinked from /Users/<user/Applications`.
- assert_match "Nothing pruned\nNo apps unlinked from /Applications",
- cmd("prune", "--verbose")
+ assert_match "Nothing pruned", cmd("prune", "--verbose")
end
def test_custom_command
--
GitLab