Merge pull request #604 from ripienaar/592

(#592) support both names for the execution wrapper
choria-legacy · Nov 11, 2019 · 5496388 · 5496388
2 parents 9185b11 + 3cc8a9c
commit 5496388
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/mcollective/util/tasks_support.rb b/lib/mcollective/util/tasks_support.rb
@@ -76,9 +76,15 @@ def aio_bin_path
       # @return [String]
       def aio_wrapper_path
         if Util.windows?
-          File.join(aio_bin_path, "task_wrapper.exe")
+          legacy = File.join(aio_bin_path, "task_wrapper.exe")
+          return legacy if File.exist?(legacy)
+
+          File.join(aio_bin_path, "execution_wrapper.exe")
         else
-          File.join(aio_bin_path, "task_wrapper")
+          legacy = File.join(aio_bin_path, "task_wrapper")
+          return legacy if File.exist?(legacy)
+
+          File.join(aio_bin_path, "execution_wrapper")
         end
       end
 

diff --git a/spec/unit/mcollective/util/tasks_support_spec.rb b/spec/unit/mcollective/util/tasks_support_spec.rb
@@ -257,6 +257,7 @@ module Util
 
       describe "#run_task_command" do
         it "should spawn the right command and wait" do
+          File.stubs(:exist?).with("/opt/puppetlabs/puppet/bin/task_wrapper").returns(true)
           File.stubs(:exist?).with(ts.wrapper_path).returns(true)
           ts.stubs(:request_spooldir).returns(File.join(cache, "test_1"))
           ts.expects(:spawn_command).with(