From 2b4e90573ed07ec6b7b83936343d503ebbe248fc Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 28 Feb 2020 21:57:00 -0800 Subject: Remove the last bits of Appveyor from the specs We don't have Appveyor anymore. Signed-off-by: Tim Smith --- spec/functional/resource/windows_certificate_spec.rb | 2 +- spec/functional/resource/windows_service_spec.rb | 3 +-- spec/functional/win32/service_manager_spec.rb | 2 +- spec/integration/client/client_spec.rb | 3 +-- spec/spec_helper.rb | 3 --- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/spec/functional/resource/windows_certificate_spec.rb b/spec/functional/resource/windows_certificate_spec.rb index 9b79de6a77..d17bb0b1fe 100644 --- a/spec/functional/resource/windows_certificate_spec.rb +++ b/spec/functional/resource/windows_certificate_spec.rb @@ -47,7 +47,7 @@ module WindowsCertificateHelper end end -describe Chef::Resource::WindowsCertificate, :windows_only, :appveyor_only do +describe Chef::Resource::WindowsCertificate, :windows_only do include WindowsCertificateHelper let(:stdout) { StringIO.new } diff --git a/spec/functional/resource/windows_service_spec.rb b/spec/functional/resource/windows_service_spec.rb index 999b235df1..1ebffd1833 100644 --- a/spec/functional/resource/windows_service_spec.rb +++ b/spec/functional/resource/windows_service_spec.rb @@ -18,8 +18,7 @@ require "spec_helper" -describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_gem_only, :appveyor_only, broken: true do - # Marking as broken. This test is causing appveyor tests to exit with 116. +describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_gem_only do include_context "using Win32::Service" diff --git a/spec/functional/win32/service_manager_spec.rb b/spec/functional/win32/service_manager_spec.rb index bb8ed54c0e..220cc3c183 100644 --- a/spec/functional/win32/service_manager_spec.rb +++ b/spec/functional/win32/service_manager_spec.rb @@ -33,7 +33,7 @@ end # directories. # -describe "Chef::Application::WindowsServiceManager", :windows_only, :system_windows_service_gem_only, :appveyor_only do +describe "Chef::Application::WindowsServiceManager", :windows_only, :system_windows_service_gem_only do include_context "using Win32::Service" diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb index b1763da1f0..e2d1c9532e 100644 --- a/spec/integration/client/client_spec.rb +++ b/spec/integration/client/client_spec.rb @@ -540,8 +540,7 @@ describe "chef-client" do end end - # Fails on appveyor, but works locally on windows and on windows hosts in Ci. - context "when using recipe-url", :skip_appveyor do + context "when using recipe-url" do before(:each) do start_tiny_server end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 36ad0e5c48..605f920125 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -140,9 +140,6 @@ RSpec.configure do |config| config.filter_run_excluding volatile_on_solaris: true if solaris? config.filter_run_excluding volatile_from_verify: false - config.filter_run_excluding skip_appveyor: true if ENV["APPVEYOR"] - config.filter_run_excluding appveyor_only: true unless ENV["APPVEYOR"] - config.filter_run_excluding skip_buildkite: true if ENV["BUILDKITE"] config.filter_run_excluding windows_only: true unless windows? -- cgit v1.2.1