Revert "Merge pull request #5123 from chef/lcg/resolv-replace"

This reverts commit e8877cd363642ed6757c48d1ed5ab35509d87e22, reversing
changes made to 162d988d3bcfce2773ef2831fa33e416f53731f6.

2 files changed, 0 insertions, 29 deletions

diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index 783429161a..9ba56a15e3 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -138,10 +138,6 @@ def freebsd?
   !!(RUBY_PLATFORM =~ /freebsd/)
 end
 
-def linux?
-  !!(RUBY_PLATFORM =~ /linux/)
-end
-
 def debian_family?
   !!(ohai[:platform_family] == "debian")
 end
diff --git a/spec/support/shared/unit/provider/file.rb b/spec/support/shared/unit/provider/file.rb
index ee3438da70..cb539ffbc3 100644
--- a/spec/support/shared/unit/provider/file.rb
+++ b/spec/support/shared/unit/provider/file.rb
@@ -683,31 +683,6 @@ shared_examples_for Chef::Provider::File do
       end
     end
 
-    context "do_resolv_conf_fixup" do
-      %w{/resolv.conf /etc/resolv.con /etc/foo/resolv.conf /c/resolv.conf}.each do |path|
-        context "when managing #{path}" do
-          let(:resource_path) { path }
-          it "does not reload the nameservers" do
-            expect(Resolv::DefaultResolver).not_to receive(:replace_resolvers)
-            provider.send(:do_resolv_conf_fixup)
-          end
-        end
-      end
-      context "when managing /etc/resolv.conf", linux_only: true do
-        let(:resource_path) { "/etc/resolv.conf" }
-        it "reloads the nameservers on linux" do
-          expect(Resolv::DefaultResolver).to receive(:replace_resolvers)
-          provider.send(:do_resolv_conf_fixup)
-        end
-      end
-      context "when managing /etc/resolv.conf", non_linux_only: true do
-        let(:resource_path) { "/etc/resolv.conf" }
-        it "does not reload the nameservers on non-linux" do
-          expect(Resolv::DefaultResolver).not_to receive(:replace_resolvers)
-          provider.send(:do_resolv_conf_fixup)
-        end
-      end
-    end
   end
 
   context "action delete" do