summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spec/functional/resource/windows_task_spec.rb2
-rw-r--r--spec/spec_helper.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/spec/functional/resource/windows_task_spec.rb b/spec/functional/resource/windows_task_spec.rb
index fbb5e4dd12..004dc12549 100644
--- a/spec/functional/resource/windows_task_spec.rb
+++ b/spec/functional/resource/windows_task_spec.rb
@@ -388,7 +388,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
end
end
- describe "action :end", :volatile do
+ describe "action :end", :requires_assign_token do
after { delete_task }
subject do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index edb5491100..70b47bd52f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -159,6 +159,9 @@ RSpec.configure do |config|
# testers. If we ever fix it we should restore it.
# config.filter_run_excluding :windows_service_requires_assign_token => true if !STDOUT.isatty && !windows_user_right?("SeAssignPrimaryTokenPrivilege")
config.filter_run_excluding :windows_service_requires_assign_token => true
+ # This filter does the same thing that :windows_service_requires_assign_token was supposed to do
+ # Need to check for SeAssignPrimaryTokenPrivilege since it's required for running a scheduled task
+ config.filter_run_excluding :requires_assign_token => true if !windows_user_right?("SeAssignPrimaryTokenPrivilege")
config.filter_run_excluding :solaris_only => true unless solaris?
config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem?
config.filter_run_excluding :unix_only => true unless unix?