lib/kitchen/verifier/pester.rb in kitchen-pester-0.12.0 vs lib/kitchen/verifier/pester.rb in kitchen-pester-0.12.1

@@ -113,13 +113,24 @@
       # Download functionality was added to the base verifier behavior after
       # version 2.3.4
       if Gem::Version.new(Kitchen::VERSION) <= Gem::Version.new("2.3.4")
         def call(state)
           super
-
+        ensure
           download_test_files(state)
         end
+      else
+        def call(state)
+          super
+        rescue
+          # If the verifier reports failure, we need to download the files ourselves.
+          # Test Kitchen's base verifier doesn't have the download in an `ensure` block.
+          download_test_files(state)
+
+          # Rethrow original exception, we still want to register the failure.
+          raise
+        end
       end
 
       # private
       def run_command_script
         <<-CMD
@@ -128,11 +139,11 @@
           $TestPath = "#{config[:root_path]}"
           $OutputFilePath = Join-Path $TestPath -ChildPath 'PesterTestResults.xml'
 
           $options = New-PesterOption -TestSuiteName "Pester - #{instance.to_str}"
 
-          $result = Invoke-Pester -Script $TestPath -OutputFile $OutputFilePath -OutputFormat NUnitXml -PesterOption $option -PassThru
+          $result = Invoke-Pester -Script $TestPath -OutputFile $OutputFilePath -OutputFormat NUnitXml -PesterOption $options -PassThru
           $result | Export-CliXml -Path (Join-Path -Path $TestPath -ChildPath 'result.xml')
 
           $LASTEXITCODE = $result.FailedCount
           $host.SetShouldExit($LASTEXITCODE)
 
@@ -223,16 +234,24 @@
                       # If the module isn't already loaded, ensure we can import it.
                       if (-not (Get-Module -Name PsGet -ErrorAction SilentlyContinue)) {
                           Import-Module -Name PsGet -Force -ErrorAction Stop
                       }
 
-                      Install-Module -Name Pester
+                      Install-Module -Name Pester -Force
                   }
                   catch {
                       Write-Host "Installing from Github"
-                      $zipfile = Join-Path (Get-Item -Path "$env:TEMP/module").FullName -ChildPath "pester.zip"
 
+                      $downloadFolder = if (Test-Path "$env:TEMP/PesterDownload") {
+                          "$env:TEMP/PesterDownload"
+                      }
+                      else {
+                          New-Item -ItemType Directory -Path "$env:TEMP/PesterDownload"
+                      }
+
+                      $zipFile = Join-Path (Get-Item -Path $downloadFolder).FullName -ChildPath "pester.zip"
+
                       if (-not (Test-Path $zipfile)) {
                           $source = 'https://github.com/pester/Pester/archive/4.10.1.zip'
                           $webClient = New-Object -TypeName Net.WebClient
 
                           if ($env:HTTP_PROXY) {
@@ -292,17 +311,10 @@
         info("Downloading test result files from #{instance.to_str}")
 
         instance.transport.connection(state) do |conn|
           config[:downloads].to_h.each do |remotes, local|
             debug("Downloading #{Array(remotes).join(", ")} to #{local}")
-
-            Array(remotes).each do |file|
-              safe_name = instance.name.gsub(/[^0-9A-Z-]/i, "_")
-              local_path = File.join(local, safe_name, file)
-              remote_path = File.join(config[:root_path], file)
-
-              conn.download(remote_path, local_path)
-            end
+            conn.download(remotes, local)
           end
         end
 
         debug("Finished downloading test result files from #{instance.to_str}")
       end