Add functional tests for exit code and flags, fix architecture test verification

1 files changed, 44 insertions, 2 deletions

diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb
index d158ebc4ef..98433203b9 100644
--- a/lib/chef/provider/powershell_script.rb
+++ b/lib/chef/provider/powershell_script.rb
@@ -22,14 +22,56 @@ class Chef
   class Provider
     class PowershellScript < Chef::Provider::WindowsScript
 
+      protected
+      
+      EXIT_STATUS_NORMALIZATION_SCRIPT = "\nif ($? -eq $true) {exit 0} elseif ( $LASTEXITCODE -ne 0) {exit $LASTEXITCODE} else { exit 1 }"
+      EXIT_STATUS_RESET_SCRIPT = "$LASTEXITCODE=0\n"
+
+      # Process exit codes are strange with PowerShell. Unless you
+      # explicitly call exit in Powershell, the powershell.exe
+      # interpreter returns only 0 for success or 1 for failure. Since
+      # we'd like to get specific exit codes from executable tools run
+      # with Powershell, we do some work using the automatic variables
+      # $? and $LASTEXITCODE to return the process exit code of the
+      # last process run in the script if it is the last command
+      # executed, otherwise 0 or 1 based on whether $? is set to true
+      # (success, where we return 0) or false (where we return 1).
+      def NormalizeScriptExitStatus( code )
+        @code = EXIT_STATUS_RESET_SCRIPT + code + EXIT_STATUS_NORMALIZATION_SCRIPT
+      end
+
+      public
+      
       def initialize (new_resource, run_context)
         super(new_resource, run_context, '.ps1')
+        NormalizeScriptExitStatus(new_resource.code)
       end
       
       def flags
-        @new_resource.flags.nil? ? '-ExecutionPolicy RemoteSigned -Command' : @new_resource.flags + '-ExecutionPolicy RemoteSigned -Command'
+        default_flags = [
+          "-NoLogo",
+          "-NonInteractive",
+          "-NoProfile",
+          "-ExecutionPolicy RemoteSigned",
+          # Powershell will hang if STDIN is redirected
+          # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
+          "-InputFormat None",
+          # Must use -File rather than -Command to launch the script
+          # file created by the base class that contains the script
+          # code -- otherwise, powershell.exe does not propagate the
+          # error status of a failed Windows process that ran at the
+          # end of the script, it gets changed to '1'.                         
+          "-File"                         
+        ]
+
+        interpreter_flags = default_flags.join(' ')
+
+        if ! (@new_resource.flags.nil?)
+          interpreter_flags = [@new_resource.flags, interpreter_flags].join(' ')
+        end
+
+        interpreter_flags
       end
-        
     end
   end
 end