Merge pull request #2249 from opscode/jdmundrawala/delete-env

Ensure delete ENV[var] from current process

2 files changed, 13 insertions, 2 deletions

diff --git a/lib/chef/provider/env/windows.rb b/lib/chef/provider/env/windows.rb
index 572ec5c633..dd7cb1bc46 100644
--- a/lib/chef/provider/env/windows.rb
+++ b/lib/chef/provider/env/windows.rb
@@ -43,14 +43,16 @@ class Chef
           obj = env_obj(@new_resource.key_name)
           if obj
             obj.delete_
-            ENV.delete(@new_resource.key_name)
             broadcast_env_change
           end
+          if ENV[@new_resource.key_name]
+            ENV.delete(@new_resource.key_name)
+          end
         end
 
         def env_value(key_name)
           obj = env_obj(key_name)
-          return obj ? obj.variablevalue : nil
+          return obj ? obj.variablevalue : ENV[key_name]
         end
 
         def env_obj(key_name)
diff --git a/spec/functional/resource/env_spec.rb b/spec/functional/resource/env_spec.rb
index cf77fef703..8178eeba3d 100755
--- a/spec/functional/resource/env_spec.rb
+++ b/spec/functional/resource/env_spec.rb
@@ -22,6 +22,7 @@ describe Chef::Resource::Env, :windows_only do
   context 'when running on Windows' do
     let(:chef_env_test_lower_case) { 'chefenvtest' }
     let(:chef_env_test_mixed_case) { 'chefENVtest' }
+    let(:env_dne_key) { 'env_dne_key' }
     let(:env_value1) { 'value1' }
     let(:env_value2) { 'value2' }
 
@@ -177,6 +178,14 @@ describe Chef::Resource::Env, :windows_only do
         expect(ENV[chef_env_test_lower_case]).to eq(nil)
         expect(ENV[chef_env_test_mixed_case]).to eq(nil)
       end
+
+      it "should delete a value from the current process even if it is not in the registry" do
+        expect(ENV[env_dne_key]).to eq(nil)
+        ENV[env_dne_key] = env_value1
+        test_resource.key_name(env_dne_key)
+        test_resource.run_action(:delete)
+        expect(ENV[env_dne_key]).to eq(nil)
+      end
     end
   end
 end