From f04ffb614d7e76997039f42d4406494e25d3390a Mon Sep 17 00:00:00 2001
From: "Tim D. Smith" <git@tim-smith.us>
Date: Wed, 29 Jun 2016 10:33:08 -0700
Subject: [PATCH] Move with_environment to testing_env

---
 Library/Homebrew/test/test_cmd_testbot.rb | 10 ----------
 Library/Homebrew/test/testing_env.rb      | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/test/test_cmd_testbot.rb b/Library/Homebrew/test/test_cmd_testbot.rb
index 77a9b3df50..40dd22f345 100644
--- a/Library/Homebrew/test/test_cmd_testbot.rb
+++ b/Library/Homebrew/test/test_cmd_testbot.rb
@@ -2,16 +2,6 @@ require "testing_env"
 require "dev-cmd/test-bot"
 
 class TestbotCommandTests < Homebrew::TestCase
-  def with_environment(partial_env)
-    old = ENV.to_hash
-    ENV.update partial_env
-    begin
-      yield
-    ensure
-      ENV.replace old
-    end
-  end
-
   def test_resolve_test_tap
     tap = Homebrew.resolve_test_tap
     assert_nil tap, "Should return nil if no tap slug provided"
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 6be622cc53..214aa97891 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -120,5 +120,15 @@ module Homebrew
     def bundle_path(name)
       Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.bundle")
     end
+
+    def with_environment(partial_env)
+      old = ENV.to_hash
+      ENV.update partial_env
+      begin
+        yield
+      ensure
+        ENV.replace old
+      end
+    end
   end
 end