Merge pull request #2967 from reitermarkus/shutdown

Silence all specs by default.

17 files changed, 40 insertions, 84 deletions

diff --git a/Library/Homebrew/test/cmd/analytics_spec.rb b/Library/Homebrew/test/cmd/analytics_spec.rb
index aed3a7a33..f29c2bb7f 100644
--- a/Library/Homebrew/test/cmd/analytics_spec.rb
+++ b/Library/Homebrew/test/cmd/analytics_spec.rb
@@ -1,9 +1,7 @@
 describe "brew analytics", :integration_test do
   before(:each) do
     HOMEBREW_REPOSITORY.cd do
-      shutup do
-        system "git", "init"
-      end
+      system "git", "init"
     end
   end
 
diff --git a/Library/Homebrew/test/cmd/bundle_spec.rb b/Library/Homebrew/test/cmd/bundle_spec.rb
index 286ddba97..c2434254e 100644
--- a/Library/Homebrew/test/cmd/bundle_spec.rb
+++ b/Library/Homebrew/test/cmd/bundle_spec.rb
@@ -4,10 +4,8 @@ describe "brew bundle", :integration_test, :needs_test_cmd_taps do
       setup_remote_tap "homebrew/bundle"
 
       HOMEBREW_REPOSITORY.cd do
-        shutup do
-          system "git", "init"
-          system "git", "commit", "--allow-empty", "-m", "This is a test commit"
-        end
+        system "git", "init"
+        system "git", "commit", "--allow-empty", "-m", "This is a test commit"
       end
 
       mktmpdir do |path|
diff --git a/Library/Homebrew/test/cmd/cask_spec.rb b/Library/Homebrew/test/cmd/cask_spec.rb
index 3bba5fbf4..aa34f50e8 100644
--- a/Library/Homebrew/test/cmd/cask_spec.rb
+++ b/Library/Homebrew/test/cmd/cask_spec.rb
@@ -2,9 +2,8 @@ describe "brew cask", :integration_test, :needs_macos, :needs_network do
   describe "list" do
     it "returns a list of installed Casks" do
       setup_remote_tap("caskroom/cask")
-      shutup do
-        expect { brew "cask", "list" }.to be_a_success
-      end
+
+      expect { brew "cask", "list" }.to be_a_success
     end
   end
 end
diff --git a/Library/Homebrew/test/cmd/desc_spec.rb b/Library/Homebrew/test/cmd/desc_spec.rb
index b09819d81..97fe929c9 100644
--- a/Library/Homebrew/test/cmd/desc_spec.rb
+++ b/Library/Homebrew/test/cmd/desc_spec.rb
@@ -30,9 +30,7 @@ describe "brew desc", :integration_test do
     it "creates a description cache" do
       expect(desc_cache).not_to exist
 
-      shutup do
-        expect { brew "desc", "--description", "testball" }.to be_a_success
-      end
+      expect { brew "desc", "--description", "testball" }.to be_a_success
 
       expect(desc_cache).to exist
     end
diff --git a/Library/Homebrew/test/cmd/fetch_spec.rb b/Library/Homebrew/test/cmd/fetch_spec.rb
index 111d9f85c..9e8d0bbf4 100644
--- a/Library/Homebrew/test/cmd/fetch_spec.rb
+++ b/Library/Homebrew/test/cmd/fetch_spec.rb
@@ -4,9 +4,7 @@ describe "brew fetch", :integration_test do
 
     expect(HOMEBREW_CACHE/"testball-0.1.tbz").not_to exist
 
-    shutup do
-      expect { brew "fetch", "testball" }.to be_a_success
-    end
+    expect { brew "fetch", "testball" }.to be_a_success
 
     expect(HOMEBREW_CACHE/"testball-0.1.tbz").to exist
   end
diff --git a/Library/Homebrew/test/cmd/install_spec.rb b/Library/Homebrew/test/cmd/install_spec.rb
index 6fff44131..b6030f26a 100644
--- a/Library/Homebrew/test/cmd/install_spec.rb
+++ b/Library/Homebrew/test/cmd/install_spec.rb
@@ -101,9 +101,7 @@ describe "brew install", :integration_test do
       .and not_to_output.to_stderr
       .and be_a_success
 
-    shutup do
-      expect { brew "switch", "testball1", "3.0" }.to be_a_success
-    end
+    expect { brew "switch", "testball1", "3.0" }.to be_a_success
 
     expect { brew "install", "testball1" }
       .to output(/2.0 is already installed/).to_stderr
@@ -156,14 +154,12 @@ describe "brew install", :integration_test do
     repo_path.join("bin").mkpath
 
     repo_path.cd do
-      shutup do
-        system "git", "init"
-        system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew-foo"
-        FileUtils.touch "bin/something.bin"
-        FileUtils.touch "README"
-        system "git", "add", "--all"
-        system "git", "commit", "-m", "Initial repo commit"
-      end
+      system "git", "init"
+      system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew-foo"
+      FileUtils.touch "bin/something.bin"
+      FileUtils.touch "README"
+      system "git", "add", "--all"
+      system "git", "commit", "-m", "Initial repo commit"
     end
 
     setup_test_formula "testball1", <<-EOS.undent
diff --git a/Library/Homebrew/test/cmd/link_spec.rb b/Library/Homebrew/test/cmd/link_spec.rb
index 59ab86cc4..78942b7a8 100644
--- a/Library/Homebrew/test/cmd/link_spec.rb
+++ b/Library/Homebrew/test/cmd/link_spec.rb
@@ -9,19 +9,15 @@ describe "brew link", :integration_test do
   it "does not fail if the given Formula is already linked" do
     setup_test_formula "testball1"
 
-    shutup do
-      expect { brew "install", "testball1" }.to be_a_success
-      expect { brew "link", "testball1" }.to be_a_success
-    end
+    expect { brew "install", "testball1" }.to be_a_success
+    expect { brew "link", "testball1" }.to be_a_success
   end
 
   it "links a given Formula" do
     setup_test_formula "testball1"
 
-    shutup do
-      expect { brew "install", "testball1" }.to be_a_success
-      expect { brew "unlink", "testball1" }.to be_a_success
-    end
+    expect { brew "install", "testball1" }.to be_a_success
+    expect { brew "unlink", "testball1" }.to be_a_success
 
     expect { brew "link", "--dry-run", "testball1" }
       .to output(/Would link/).to_stdout
@@ -44,9 +40,7 @@ describe "brew link", :integration_test do
       keg_only "just because"
     EOS
 
-    shutup do
-      expect { brew "install", "testball1" }.to be_a_success
-    end
+    expect { brew "install", "testball1" }.to be_a_success
 
     expect { brew "link", "testball1", "SHELL" => "/bin/zsh" }
       .to output(/testball1 is keg-only/).to_stderr
diff --git a/Library/Homebrew/test/cmd/log_spec.rb b/Library/Homebrew/test/cmd/log_spec.rb
index b9e3e8d3e..26b59816c 100644
--- a/Library/Homebrew/test/cmd/log_spec.rb
+++ b/Library/Homebrew/test/cmd/log_spec.rb
@@ -1,10 +1,8 @@
 describe "brew log", :integration_test do
   it "shows the Git log for the Homebrew repository when no argument is given" do
     HOMEBREW_REPOSITORY.cd do
-      shutup do
-        system "git", "init"
-        system "git", "commit", "--allow-empty", "-m", "This is a test commit"
-      end
+      system "git", "init"
+      system "git", "commit", "--allow-empty", "-m", "This is a test commit"
     end
 
     expect { brew "log" }
@@ -18,18 +16,15 @@ describe "brew log", :integration_test do
 
     core_tap = CoreTap.new
     core_tap.path.cd do
-      shutup do
-        system "git", "init"
-        system "git", "add", "--all"
-        system "git", "commit", "-m", "This is a test commit for Testball"
-      end
+      system "git", "init"
+      system "git", "add", "--all"
+      system "git", "commit", "-m", "This is a test commit for Testball"
     end
 
     core_tap_url = "file://#{core_tap.path}"
     shallow_tap = Tap.fetch("homebrew", "shallow")
-    shutup do
-      system "git", "clone", "--depth=1", core_tap_url, shallow_tap.path
-    end
+
+    system "git", "clone", "--depth=1", core_tap_url, shallow_tap.path
 
     expect { brew "log", "#{shallow_tap}/testball" }
       .to output(/This is a test commit for Testball/).to_stdout
diff --git a/Library/Homebrew/test/cmd/outdated_spec.rb b/Library/Homebrew/test/cmd/outdated_spec.rb
index 65cce27c3..8b4c01e53 100644
--- a/Library/Homebrew/test/cmd/outdated_spec.rb
+++ b/Library/Homebrew/test/cmd/outdated_spec.rb
@@ -28,9 +28,7 @@ describe "brew outdated", :integration_test do
       setup_test_formula "testball"
       (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath
 
-      shutup do
-        expect { brew "pin", "testball" }.to be_a_success
-      end
+      expect { brew "pin", "testball" }.to be_a_success
 
       expect { brew "outdated", "--verbose" }
         .to output("testball (0.0.1) < 0.1 [pinned at 0.0.1]\n").to_stdout
@@ -44,9 +42,7 @@ describe "brew outdated", :integration_test do
       setup_test_formula "testball"
       (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath
 
-      shutup do
-        expect { brew "pin", "testball" }.to be_a_success
-      end
+      expect { brew "pin", "testball" }.to be_a_success
 
       expected_json = [
         {
diff --git a/Library/Homebrew/test/cmd/pin_spec.rb b/Library/Homebrew/test/cmd/pin_spec.rb
index 9ffc052c3..a8f680d71 100644
--- a/Library/Homebrew/test/cmd/pin_spec.rb
+++ b/Library/Homebrew/test/cmd/pin_spec.rb
@@ -3,10 +3,8 @@ describe "brew pin", :integration_test do
     setup_test_formula "testball"
     (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath
 
-    shutup do
-      expect { brew "pin", "testball" }.to be_a_success
-      expect { brew "upgrade" }.to be_a_success
-    end
+    expect { brew "pin", "testball" }.to be_a_success
+    expect { brew "upgrade" }.to be_a_success
 
     expect(HOMEBREW_CELLAR/"testball/0.1").not_to be_a_directory
   end
diff --git a/Library/Homebrew/test/cmd/reinstall_spec.rb b/Library/Homebrew/test/cmd/reinstall_spec.rb
index 63584e6be..f5794049d 100644
--- a/Library/Homebrew/test/cmd/reinstall_spec.rb
+++ b/Library/Homebrew/test/cmd/reinstall_spec.rb
@@ -4,9 +4,7 @@ describe "brew reinstall", :integration_test do
   before(:each) do
     setup_test_formula "testball"
 
-    shutup do
-      expect { brew "install", "testball", "--with-foo" }.to be_a_success
-    end
+    expect { brew "install", "testball", "--with-foo" }.to be_a_success
   end
 
   it "reinstalls a Formula" do
diff --git a/Library/Homebrew/test/cmd/switch_spec.rb b/Library/Homebrew/test/cmd/switch_spec.rb
index c27c96c14..00fe4ace6 100644
--- a/Library/Homebrew/test/cmd/switch_spec.rb
+++ b/Library/Homebrew/test/cmd/switch_spec.rb
@@ -14,9 +14,7 @@ describe "brew switch", :integration_test do
       keg_only "just because"
     EOS
 
-    shutup do
-      expect { brew "install", "testball" }.to be_a_success
-    end
+    expect { brew "install", "testball" }.to be_a_success
 
     testball_rack = HOMEBREW_CELLAR/"testball"
     FileUtils.cp_r testball_rack/"0.1", testball_rack/"0.2"
diff --git a/Library/Homebrew/test/cmd/uninstall_spec.rb b/Library/Homebrew/test/cmd/uninstall_spec.rb
index b9a0d8d40..27ab0e1f7 100644
--- a/Library/Homebrew/test/cmd/uninstall_spec.rb
+++ b/Library/Homebrew/test/cmd/uninstall_spec.rb
@@ -2,9 +2,7 @@ require "cmd/uninstall"
 
 describe "brew uninstall", :integration_test do
   it "uninstalls a given Formula" do
-    shutup do
-      expect { brew "install", testball }.to be_a_success
-    end
+    expect { brew "install", testball }.to be_a_success
 
     expect { brew "uninstall", "--force", testball }
       .to output(/Uninstalling testball/).to_stdout
diff --git a/Library/Homebrew/test/cmd/unlink_spec.rb b/Library/Homebrew/test/cmd/unlink_spec.rb
index 5961651fe..1fd242506 100644
--- a/Library/Homebrew/test/cmd/unlink_spec.rb
+++ b/Library/Homebrew/test/cmd/unlink_spec.rb
@@ -2,9 +2,7 @@ describe "brew unlink", :integration_test do
   it "unlinks a Formula" do
     setup_test_formula "testball"
 
-    shutup do
-      expect { brew "install", "testball" }.to be_a_success
-    end
+    expect { brew "install", "testball" }.to be_a_success
 
     expect { brew "unlink", "--dry-run", "testball" }
       .to output(/Would remove/).to_stdout
diff --git a/Library/Homebrew/test/cmd/unpack_spec.rb b/Library/Homebrew/test/cmd/unpack_spec.rb
index 9b2b801bc..8bfe15c9f 100644
--- a/Library/Homebrew/test/cmd/unpack_spec.rb
+++ b/Library/Homebrew/test/cmd/unpack_spec.rb
@@ -3,10 +3,8 @@ describe "brew unpack", :integration_test do
     setup_test_formula "testball"
 
     mktmpdir do |path|
-      shutup do
-        expect { brew "unpack", "testball", "--destdir=#{path}" }
-          .to be_a_success
-      end
+      expect { brew "unpack", "testball", "--destdir=#{path}" }
+        .to be_a_success
 
       expect(path/"testball-0.1").to be_a_directory
     end
diff --git a/Library/Homebrew/test/cmd/unpin_spec.rb b/Library/Homebrew/test/cmd/unpin_spec.rb
index 4f14626d8..29d5f0c8a 100644
--- a/Library/Homebrew/test/cmd/unpin_spec.rb
+++ b/Library/Homebrew/test/cmd/unpin_spec.rb
@@ -3,11 +3,9 @@ describe "brew unpin", :integration_test do
     setup_test_formula "testball"
     (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath
 
-    shutup do
-      expect { brew "pin", "testball" }.to be_a_success
-      expect { brew "unpin", "testball" }.to be_a_success
-      expect { brew "upgrade" }.to be_a_success
-    end
+    expect { brew "pin", "testball" }.to be_a_success
+    expect { brew "unpin", "testball" }.to be_a_success
+    expect { brew "upgrade" }.to be_a_success
 
     expect(HOMEBREW_CELLAR/"testball/0.1").to be_a_directory
   end
diff --git a/Library/Homebrew/test/cmd/upgrade_spec.rb b/Library/Homebrew/test/cmd/upgrade_spec.rb
index 84f5c09f4..10d5386a1 100644
--- a/Library/Homebrew/test/cmd/upgrade_spec.rb
+++ b/Library/Homebrew/test/cmd/upgrade_spec.rb
@@ -3,9 +3,7 @@ describe "brew upgrade", :integration_test do
     setup_test_formula "testball"
     (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath
 
-    shutup do
-      expect { brew "upgrade" }.to be_a_success
-    end
+    expect { brew "upgrade" }.to be_a_success
 
     expect(HOMEBREW_CELLAR/"testball/0.1").to be_a_directory
   end