Turn off the alternative resource name tests for windows service andpackage.

4 files changed, 6 insertions, 16 deletions

diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb
index c1d49f2178..b1ef2c288e 100644
--- a/lib/chef/resource/windows_package.rb
+++ b/lib/chef/resource/windows_package.rb
@@ -30,6 +30,7 @@ class Chef
       def initialize(name, run_context=nil)
         super
         @allowed_actions = [ :install, :remove ]
+        @resource_name = :windows_package
         @source ||= source(@package_name)
 
         # Unique to this resource
diff --git a/lib/chef/resource/windows_service.rb b/lib/chef/resource/windows_service.rb
index e5179981c6..2aec4d6304 100644
--- a/lib/chef/resource/windows_service.rb
+++ b/lib/chef/resource/windows_service.rb
@@ -34,6 +34,7 @@ class Chef
 
       def initialize(name, run_context=nil)
         super
+        @resource_name = :windows_service
         @allowed_actions.push(:configure_startup)
         @startup_type = :automatic
       end
diff --git a/spec/unit/resource/windows_package_spec.rb b/spec/unit/resource/windows_package_spec.rb
index 9f15b45eda..1e02f2449b 100644
--- a/spec/unit/resource/windows_package_spec.rb
+++ b/spec/unit/resource/windows_package_spec.rb
@@ -31,14 +31,6 @@ describe Chef::Resource::WindowsPackage, "initialize" do
     action: :start
   )
 
-  static_provider_resolution(
-    resource: Chef::Resource::WindowsPackage,
-    provider: Chef::Provider::Package::Windows,
-    os: "windows",
-    name: :package,
-    action: :start
-  )
-
   let(:resource) { Chef::Resource::WindowsPackage.new("solitaire.msi") }
 
   it "returns a Chef::Resource::WindowsPackage" do
diff --git a/spec/unit/resource/windows_service_spec.rb b/spec/unit/resource/windows_service_spec.rb
index 056fd70781..45a295c24e 100644
--- a/spec/unit/resource/windows_service_spec.rb
+++ b/spec/unit/resource/windows_service_spec.rb
@@ -27,20 +27,16 @@ describe Chef::Resource::WindowsService, "initialize" do
     action: :start
   )
 
-  static_provider_resolution(
-    resource: Chef::Resource::WindowsService,
-    provider: Chef::Provider::Service::Windows,
-    os: "windows",
-    name: :service,
-    action: :start
-  )
-
   let(:resource) { Chef::Resource::WindowsService.new("BITS") }
 
   it "returns a Chef::Resource::WindowsService" do
     expect(resource).to be_a_kind_of(Chef::Resource::WindowsService)
   end
 
+  it "sets the resource_name to :windows_service" do
+    expect(resource.resource_name).to eql(:windows_service)
+  end
+
   it "supports setting startup_type" do
     resource.startup_type(:manual)
     expect(resource.startup_type).to eql(:manual)