Merge branch '2.6.next' into 2.6.x

* 2.6.next: (102 commits)
  (#5073) Download plugins even if you're filtering on tags
  Fix #5610: Prevent unnecessary RAL lookups
  Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
  (#6723) Fix withenv environment restoration bug
  (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
  Remove extra trailing whitespace from lib/puppet/resource.rb
  (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
  (#6707) Fix typo in rest_authconfig.rb
  (#6689) Make inventory_active_record terminus search quickly
  (#5392) Give a better error when realizing a non-existant resource
  (#2645) Adding a less-stubby test to verify the "system" attribute's behavior
  maint: Remove serialization of InventoryFact values
  maint: Rename InventoryHost to InventoryNode
  Fixed #2645 - Added support for creating system users
  maint: Remove spec run noise
  maint:Refactor of mount provider integration tests
  (#6338) Support searching on metadata in InventoryActiveRecord terminus
  (#6338) Implement search for InventoryActiveRecord facts terminus
  (#6338) Add an InventoryActiveRecord terminus for Facts
  Added integration tests for the mount provider
  ...

1 files changed, 49 insertions, 0 deletions

diff --git a/spec/unit/util/execution_spec.rb b/spec/unit/util/execution_spec.rb
new file mode 100644
index 000000000..312dd3b8e
--- /dev/null
+++ b/spec/unit/util/execution_spec.rb
@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Puppet::Util::Execution do
+  include Puppet::Util::Execution
+  describe "#withenv" do
+    before :each do
+      @original_path = ENV["PATH"]
+      @new_env = {:PATH => "/some/bogus/path"}
+    end
+
+    it "should change environment variables within the block then reset environment variables to their original values" do
+      withenv @new_env do
+        ENV["PATH"].should == "/some/bogus/path"
+      end
+      ENV["PATH"].should == @original_path
+    end
+
+    it "should reset environment variables to their original values even if the block fails" do
+      begin
+        withenv @new_env do
+          ENV["PATH"].should == "/some/bogus/path"
+          raise "This is a failure"
+        end
+      rescue
+      end
+      ENV["PATH"].should == @original_path
+    end
+
+    it "should reset environment variables even when they are set twice" do
+      # Setting Path & Environment parameters in Exec type can cause weirdness
+      @new_env["PATH"] = "/someother/bogus/path"
+      withenv @new_env do
+        # When assigning duplicate keys, can't guarantee order of evaluation
+        ENV["PATH"].should =~ /\/some.*\/bogus\/path/
+      end
+      ENV["PATH"].should == @original_path
+    end
+
+    it "should remove any new environment variables after the block ends" do
+      @new_env[:FOO] = "bar"
+      withenv @new_env do
+        ENV["FOO"].should == "bar"
+      end
+      ENV["FOO"].should == nil
+    end
+  end
+end