test-kitchen 3.1.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5e05dc50e7052b2002a94e950f5691d953c78d5e408b80a0f7f977ab63eb35
-  data.tar.gz: 43bc1979cc77277d4a3219f82d8fead18e7aa3cf068fb7484f5176ce422c8767
+  metadata.gz: ecd483d58546fb48da8bb5a4e5c448b7cc2f8b7d2c0082d0df4b023c380a2594
+  data.tar.gz: cb42f2dae4d33d84ff8515a7412d7e1d14c358504f66429b21465bef7714e48b
 SHA512:
-  metadata.gz: 12453b3cbf1ef1dfb49b683667fca52502b10a888e9cf953d58c22589ce99dffc9864d550463c80341049f7073aa3c3fb98eb76c4e432aa266956b6a0a86c332
-  data.tar.gz: bc19f713f60acc0b5437c5b29ab241255a7a82de2b206ba714596bf2a251c0e9a3c21bc152a18e171461ca24d9291098b55baeec474e495f46824782487350b8
+  metadata.gz: 8adf00afe37d4b31dec9b6acca4aee2aa858b265db0fee4f0c0fac8407691f452e7d487d45ec5f72e816d0799060affcaf31d8885597ade1a9d40dc59f6056bc
+  data.tar.gz: bc82343bf133cbce4c9c5096d1d88a9bb7ab56cf619d289f71008388757d553c43432f3188d72ddc87c917212ce6a6278ee0d81a64b8f7d688341e387da2949f

data/Gemfile

@@ -1,21 +1,26 @@
 source "https://rubygems.org"
 
-# Specify your gem"s dependencies in test-kitchen.gemspec
 gemspec
 
+group :test do
+  gem "rake"
+  gem "rb-readline"
+  gem "aruba",     ">= 0.11", "< 3.0"
+  gem "countloc",  "~> 0.4"
+  gem "cucumber",  ">= 2.1", "< 8.1"
+  gem "fakefs",    "~> 2.0"
+  gem "maruku",    "~> 0.6"
+  gem "minitest",  "~> 5.3", "< 5.16"
+  gem "mocha",     "~> 2.0"
+end
+
 group :integration do
   gem "berkshelf"
-  gem "kitchen-inspec"
   gem "kitchen-dokken"
+  gem "kitchen-inspec"
   gem "kitchen-vagrant"
 end
 
-group :debug do
-  gem "pry", "~>0.12"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
-end
-
 group :chefstyle do
-  gem "chefstyle", "2.1.0"
-end
+  gem "chefstyle", "2.2.3"
+end

data/lib/kitchen/cli.rb

@@ -44,7 +44,7 @@ module Kitchen
           action: task,
           help: -> { help(task) },
           config: @config,
-          shell: shell,
+          shell:,
         }.merge(additional_options)
 
         str_const = Thor::Util.camel_case(command)

data/lib/kitchen/command/diagnose.rb

@@ -33,7 +33,7 @@ module Kitchen
         loader = record_failure { load_loader }
 
         puts YAML.dump(Kitchen::Diagnostic.new(
-          loader: loader, instances: instances, plugins: plugins?
+          loader:, instances:, plugins: plugins?
         ).read)
       end
 

data/lib/kitchen/config.rb

@@ -216,11 +216,11 @@ module Kitchen
             /^win/i.match?(platform) ? "winrm" : Transport::DEFAULT_PLUGIN
           end,
         },
-        kitchen_root: kitchen_root,
-        test_base_path: test_base_path,
-        log_level: log_level,
-        log_overwrite: log_overwrite,
-        debug: debug,
+        kitchen_root:,
+        test_base_path:,
+        log_level:,
+        log_overwrite:,
+        debug:,
       }
     end
 
@@ -250,8 +250,8 @@ module Kitchen
         driver: new_driver(suite, platform),
         lifecycle_hooks: new_lifecycle_hooks(suite, platform, sf),
         logger: new_instance_logger(suite, platform, index),
-        suite: suite,
-        platform: platform,
+        suite:,
+        platform:,
         provisioner: new_provisioner(suite, platform),
         transport: new_transport(suite, platform),
         verifier: new_verifier(suite, platform),
@@ -275,7 +275,7 @@ module Kitchen
         color: Color::COLORS[index % Color::COLORS.size].to_sym,
         logdev: log_location,
         level: Util.to_logger_level(log_level),
-        log_overwrite: log_overwrite,
+        log_overwrite:,
         progname: name,
         colorize: @colorize
       )

data/lib/kitchen/configurable.rb

@@ -241,7 +241,7 @@ module Kitchen
           #{deprecated_config.keys.join("\n")}
           Run 'kitchen doctor' for details.
         MSG
-        warn(warning)
+        Error.warn_on_stderr(warning)
 
         # Set global var that the deprecation message has been printed
         @@has_been_warned_of_deprecations = true

data/lib/kitchen/driver/ssh_base.rb

@@ -70,7 +70,7 @@ module Kitchen
       def converge(state) # rubocop:disable Metrics/AbcSize
         provisioner = instance.provisioner
         provisioner.create_sandbox
-        sandbox_dirs = Util.list_directory(provisioner.sandbox_path)
+        sandbox_dirs = provisioner.sandbox_dirs
 
         instance.transport.connection(backcompat_merged_state(state)) do |conn|
           conn.execute(env_cmd(provisioner.install_command))
@@ -299,7 +299,7 @@ module Kitchen
       # @param options [Hash] configuration hash (default: `{}`)
       # @api private
       def wait_for_sshd(hostname, username = nil, options = {})
-        pseudo_state = { hostname: hostname }
+        pseudo_state = { hostname: }
         pseudo_state[:username] = username if username
         pseudo_state.merge!(options)
 

data/lib/kitchen/errors.rb

@@ -94,6 +94,19 @@ module Kitchen
         "".center(22, "-"),
       ]
     end
+
+    # Log a warn message on STDERR device.
+    # This will help to distinguish between the errors and
+    # output when parsing the output from the commands like
+    # kitchen diagnose.
+    #
+    # @params lines [Array<String>] Array of lines that needs to be printed
+    def self.warn_on_stderr(lines)
+      Array(lines).each do |line|
+        line = Color.colorize(line, :blue) if Kitchen.tty?
+        $stderr.puts(line)
+      end
+    end
   end
 
   # Base exception class from which all Kitchen exceptions derive. This class

data/lib/kitchen/lifecycle_hook/base.rb

@@ -1,3 +1,5 @@
+require_relative "../platform_filter"
+
 module Kitchen
   class LifecycleHook
     class Base
@@ -59,14 +61,14 @@ module Kitchen
         lifecycle_hooks.state_file
       end
 
-      # @return [Array<String>] names of excluded platforms
+      # @return [Array<PlatformFilter>] names of excluded platforms
       def excludes
-        @excludes ||= hook.fetch(:excludes, [])
+        @excludes ||= PlatformFilter.convert(hook.fetch(:excludes, []))
       end
 
-      # @return [Array<String>] names of only included platforms
+      # @return [Array<PlatformFilter>] names of only included platforms
       def includes
-        @includes ||= hook.fetch(:includes, [])
+        @includes ||= PlatformFilter.convert(hook.fetch(:includes, []))
       end
 
       # @return [String]

data/lib/kitchen/lifecycle_hook/local.rb

@@ -38,7 +38,7 @@ module Kitchen
                 config[:kitchen_root]
               end
         # Build the options for mixlib-shellout.
-        opts = {}.merge(user).merge(cwd: cwd, environment: environment)
+        opts = {}.merge(user).merge(cwd:, environment:)
         run_command(command, opts)
       end
 

data/lib/kitchen/lifecycle_hooks.rb

@@ -46,6 +46,8 @@ module Kitchen
       run(phase, :pre)
       yield
       run(phase, :post)
+    ensure
+      run(phase, :finally)
     end
 
     # @return [Kitchen::StateFile]
@@ -56,7 +58,7 @@ module Kitchen
     # Execute a specific lifecycle hook.
     #
     # @param phase [String] Lifecycle phase which is being executed.
-    # @param hook_timing [Symbol] `:pre` or `:post` to indicate which hook to run.
+    # @param hook_timing [Symbol] `:pre`, `:post`, or `:finally` to indicate which hook to run.
     # @return [void]
     def run(phase, hook_timing)
       # Yes this has to be a symbol because of how data munger works.

data/lib/kitchen/loader/yaml.rb

@@ -352,14 +352,7 @@ module Kitchen
       def parse_yaml_string(string, file_name)
         return {} if string.nil? || string.empty?
 
-        result =
-          if Gem::Requirement.new(">= 3.1.0").satisfied_by?(Gem::Version.new(Psych::VERSION))
-            # ruby >= 2.6.0
-            ::YAML.safe_load(string, permitted_classes: [Symbol], permitted_symbols: [], aliases: true) || {}
-          else
-            # ruby < 2.6.0
-            ::YAML.safe_load(string, [Symbol], [], true) || {}
-          end
+        result = ::YAML.safe_load(string, permitted_classes: [Symbol], permitted_symbols: [], aliases: true) || {}
         unless result.is_a?(Hash)
           raise UserError, "Error parsing #{file_name} as YAML " \
             "(Result of parse was not a Hash, but was a #{result.class}).\n" \

data/lib/kitchen/platform.rb

@@ -58,7 +58,7 @@ module Kitchen
     #
     # @return [Hash] a diagnostic hash
     def diagnose
-      { os_type: os_type, shell_type: shell_type }
+      { os_type:, shell_type: }
     end
   end
 end

data/lib/kitchen/platform_filter.rb

@@ -0,0 +1,72 @@
+#
+# Author:: Baptiste Courtois (<b.courtois@criteo.com>)
+#
+# Copyright (C) 2021, Baptiste Courtois
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Kitchen
+  # A wrapper on Regexp and strings to mix them in platform filters.
+  #
+  # This should handle backward compatibility in most cases were
+  # platform are matched against a filters array using Array.include?
+  #
+  # This wrapper does not work if filters arrays are converted to Set.
+  #
+  # @author Baptiste Courtois <b.courtois@criteo.com>
+  class PlatformFilter
+    # Pattern used to determine whether a filter should be handled as a Regexp
+    REGEXP_LIKE_PATTERN = %r{^/(?<pattern>.*)/(?<options>[ix]*)$}
+
+    # Converts platform filters into an array of PlatformFilter handling both strings and Regexp.
+    # A string "looks-like" a regexp if it starts by / and end by / + Regexp options i or x
+    #
+    # @return [Array] filters with regexp-like string converted to PlatformRegexpFilter
+    def self.convert(filters)
+      ::Kernel.Array(filters).map do |filter|
+        if (match = filter.match(REGEXP_LIKE_PATTERN))
+          options = match["options"].include?("i") ? ::Regexp::IGNORECASE : 0
+          options |= ::Regexp::EXTENDED if match["options"].include?("x")
+          filter = ::Regexp.new(match["pattern"], options)
+        end
+        new(filter)
+      end
+    end
+
+    # @return [Regexp] value of this filter
+    attr_reader :value
+
+    # Constructs a new filter.
+    #
+    # @param [Regexp,String] value of the filter
+    def initialize(value)
+      raise ::ArgumentError, "PlatformFilter#new requires value to be a String or a Regexp" unless value.is_a?(::Regexp) || value.is_a?(::String)
+
+      @value = value
+    end
+
+    # Override of the equality operator to check whether the wrapped Regexp match the given object.
+    #
+    # @param [Object] other object to compare to
+    # @return [Boolean] whether the objects are equal or the wrapped Regexp matches the given string or symbol
+    def ==(other)
+      if @value.is_a?(::Regexp) && (other.is_a?(::String) || other.is_a?(::Symbol))
+        @value =~ other
+      else
+        other == @value
+      end
+    end
+
+    alias eq? ==
+  end
+end

data/lib/kitchen/plugin_base.rb

@@ -54,7 +54,6 @@ module Kitchen
         @serial_actions ||= []
         @serial_actions += methods
       end
-
     end
   end
 end

data/lib/kitchen/provisioner/base.rb

@@ -70,7 +70,6 @@ module Kitchen
       # rubocop:disable Metrics/AbcSize
       def call(state)
         create_sandbox
-        sandbox_dirs = Util.list_directory(sandbox_path)
 
         instance.transport.connection(state) do |conn|
           config[:uploads].to_h.each do |locals, remote|
@@ -182,6 +181,13 @@ module Kitchen
           "trying to access the path."
       end
 
+      # Returns the list of items in the sandbox directory
+      #
+      # @return [String] path of items in the sandbox directory
+      def sandbox_dirs
+        Util.list_directory(sandbox_path)
+      end
+
       # Deletes the sandbox path. Without calling this method, the sandbox path
       # will persist after the process terminates. In other words, cleanup is
       # explicit. This method is safe to call multiple times.

data/lib/kitchen/provisioner/chef/common_sandbox.rb

@@ -287,16 +287,17 @@ module Kitchen
         def update_dna_for_policyfile
           policy = Chef::Policyfile.new(
             policyfile, sandbox_path,
-            logger: logger,
+            logger:,
             always_update: config[:always_update_cookbooks],
-            policy_group: policy_group
+            policy_group:,
+            license: config[:chef_license]
           )
           Kitchen.mutex.synchronize do
             policy.compile
           end
           policy_name = JSON.parse(IO.read(policy.lockfile))["name"]
           policy_group = config[:policy_group] || "local"
-          config[:attributes].merge(policy_name: policy_name, policy_group: policy_group)
+          config[:attributes].merge(policy_name:, policy_group:)
         end
 
         # Performs a Policyfile cookbook resolution inside a common mutex.
@@ -306,9 +307,10 @@ module Kitchen
           Kitchen.mutex.synchronize do
             Chef::Policyfile.new(
               policyfile, sandbox_path,
-              logger: logger,
+              logger:,
               always_update: config[:always_update_cookbooks],
-              policy_group: config[:policy_group]
+              policy_group: config[:policy_group],
+              license: config[:chef_license]
             ).resolve
           end
         end
@@ -319,7 +321,7 @@ module Kitchen
         def resolve_with_berkshelf
           Kitchen.mutex.synchronize do
             Chef::Berkshelf.new(berksfile, tmpbooks_dir,
-              logger: logger,
+              logger:,
               always_update: config[:always_update_cookbooks]).resolve
           end
         end

data/lib/kitchen/provisioner/chef/policyfile.rb

@@ -41,12 +41,13 @@ module Kitchen
         #   cookbooks
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
         #   to `Kitchen.logger`
-        def initialize(policyfile, path, logger: Kitchen.logger, always_update: false, policy_group: nil)
+        def initialize(policyfile, path, license: nil, logger: Kitchen.logger, always_update: false, policy_group: nil)
           @policyfile    = policyfile
           @path          = path
           @logger        = logger
           @always_update = always_update
           @policy_group  = policy_group
+          @license       = license
         end
 
         # Loads the library code required to use the resolver.
@@ -62,10 +63,10 @@ module Kitchen
         def resolve
           if policy_group
             info("Exporting cookbook dependencies from Policyfile #{path} with policy_group #{policy_group} using `#{cli_path} export`...")
-            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --policy_group #{policy_group} --force")
+            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --policy_group #{policy_group} --force --chef-license #{license}")
           else
             info("Exporting cookbook dependencies from Policyfile #{path} using `#{cli_path} export`...")
-            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --force")
+            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --force --chef-license #{license}")
           end
         end
 
@@ -77,11 +78,11 @@ module Kitchen
           else
             info("Policy lock file doesn't exist, running `#{cli_path} install` for Policyfile #{policyfile}...")
           end
-          run_command("#{cli_path} install #{escape_path(policyfile)}")
+          run_command("#{cli_path} install #{escape_path(policyfile)} --chef-license #{license}")
 
           if always_update
             info("Updating policy lock using `#{cli_path} update`")
-            run_command("#{cli_path} update #{escape_path(policyfile)}")
+            run_command("#{cli_path} update #{escape_path(policyfile)} --chef-license #{license}")
           end
         end
 
@@ -114,6 +115,10 @@ module Kitchen
         # @api private
         attr_reader :policy_group
 
+        # @return [String] name of the chef_license
+        # @api private
+        attr_reader :license
+
         # Escape spaces in a path in way that works with both Sh (Unix) and
         # Windows.
         #
@@ -152,11 +157,10 @@ module Kitchen
         def no_cli_found_error
           @logger.fatal("The `chef` or `chef-cli` executables cannot be found in your " \
                         "PATH. Ensure you have installed Chef Workstation " \
-                        "from https://downloads.chef.io and that your PATH " \
+                        "from https://www.chef.io/downloads/ and that your PATH " \
                         "setting includes the path to the `chef` or `chef-cli` commands.")
           raise UserError, "Could not find the chef or chef-cli executables in your PATH."
         end
-
       end
     end
   end

data/lib/kitchen/provisioner/chef_base.rb

@@ -69,7 +69,7 @@ module Kitchen
         README.* VERSION metadata.{json,rb} attributes.rb recipe.rb
         attributes/**/* definitions/**/* files/**/* libraries/**/*
         providers/**/* recipes/**/* resources/**/* templates/**/*
-        ohai/**/*
+        ohai/**/* compliance/**/*
       ).join(",")
       # to ease upgrades, allow the user to turn deprecation warnings into errors
       default_config :deprecations_as_errors, false
@@ -210,7 +210,7 @@ module Kitchen
 
       deprecate_config_for :install_msi_url, Util.outdent!(<<-MSG)
         The 'install_msi_url' will be relaced by the 'download_url' attribute.
-        'download_url' will be applied to Bourne and Powershell download scripts.
+        'download_url' will be applied to Bourne and PowerShell download scripts.
 
         Note: 'product_name' must be set in order to use 'download_url'
         until 'product_name' replaces 'require_chef_omnibus' as the default.
@@ -347,7 +347,7 @@ module Kitchen
           omnibus_url: config[:chef_omnibus_url],
           project: project.nil? ? nil : project[1],
           install_flags: config[:chef_omnibus_install_options],
-          sudo_command: sudo_command,
+          sudo_command:,
         }.tap do |opts|
           opts[:root] = config[:chef_omnibus_root] if config.key? :chef_omnibus_root
           %i{install_msi_url http_proxy https_proxy}.each do |key|
@@ -482,10 +482,10 @@ module Kitchen
         super
         if File.exist?(policyfile)
           debug("Policyfile found at #{policyfile}, using Policyfile to resolve cookbook dependencies")
-          Chef::Policyfile.load!(logger: logger)
+          Chef::Policyfile.load!(logger:)
         elsif File.exist?(berksfile)
           debug("Berksfile found at #{berksfile}, using Berkshelf to resolve cookbook dependencies")
-          Chef::Berkshelf.load!(logger: logger)
+          Chef::Berkshelf.load!(logger:)
         end
       end
 
@@ -681,25 +681,42 @@ module Kitchen
         chef_cmds(base_cmd).join(separator)
       end
 
-      # Gives an array of command
+      # Gives an array of commands
       # @api private
       def chef_cmds(base_cmd)
-        cmd = prefix_command(wrap_shell_code(
-          [base_cmd, *chef_args(config_filename), last_exit_code].join(" ")
-          .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-        ))
-
-        cmds = [cmd].cycle(config[:multiple_converge].to_i).to_a
-
-        if config[:enforce_idempotency]
-          idempotent_cmd = prefix_command(wrap_shell_code(
-            [base_cmd, *chef_args("client_no_updated_resources.rb"), last_exit_code].join(" ")
-            .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-          ))
-          cmds[-1] = idempotent_cmd
+        cmds = []
+        num_converges = config[:multiple_converge].to_i
+        idempotency   = config[:enforce_idempotency]
+
+        # Execute Chef Client n-1 times, without exiting
+        (num_converges - 1).times do
+          cmds << wrapped_chef_cmd(base_cmd, config_filename)
         end
+
+        # Append another execution with Windows specific Exit code helper or (for
+        # idempotency check) a specific config file which assures no changed resources.
+        cmds << unless idempotency
+                  wrapped_chef_cmd(base_cmd, config_filename, append: last_exit_code)
+                else
+                  wrapped_chef_cmd(base_cmd, "client_no_updated_resources.rb", append: last_exit_code)
+                end
         cmds
       end
+
+      # Concatenate all arguments and wrap it with shell-specifics
+      # @api private
+      def wrapped_chef_cmd(base_cmd, configfile, append: "")
+        args = []
+
+        args << base_cmd
+        args << chef_args(configfile)
+        args << append
+
+        shell_cmd = args.flatten.join(" ")
+        shell_cmd = shell_cmd.prepend(reload_ps1_path) if windows_os?
+
+        prefix_command(wrap_shell_code(shell_cmd))
+      end
     end
   end
 end

data/lib/kitchen/provisioner/shell.rb

@@ -151,7 +151,6 @@ module Kitchen
           info("No provisioner script file specified, skipping")
         end
       end
-
     end
   end
 end

data/lib/kitchen/ssh.rb

@@ -23,6 +23,7 @@ require "socket" unless defined?(Socket)
 
 require_relative "errors"
 require_relative "login_command"
+require_relative "util"
 
 module Kitchen
   # Wrapped exception for any internally raised SSH-related errors.
@@ -75,7 +76,9 @@ module Kitchen
     # @param cmd [String] command string to execute
     # @raise [SSHFailed] if the command does not exit with a 0 code
     def exec(cmd)
-      logger.debug("[SSH] #{self} (#{cmd})")
+      string_to_mask = "[SSH] #{self} (#{cmd})"
+      masked_string = Util.mask_values(string_to_mask, %w{password ssh_http_proxy_password})
+      logger.debug(masked_string)
       exit_code = exec_with_exit(cmd)
 
       if exit_code != 0
@@ -137,7 +140,9 @@ module Kitchen
     def shutdown
       return if @session.nil?
 
-      logger.debug("[SSH] closing connection to #{self}")
+      string_to_mask = "[SSH] closing connection to #{self}"
+      masked_string = Util.mask_values(string_to_mask, %w{password ssh_http_proxy_password})
+      logger.debug(masked_string)
       session.shutdown!
     ensure
       @session = nil
@@ -212,7 +217,9 @@ module Kitchen
       retries = options[:ssh_retries] || 3
 
       begin
-        logger.debug("[SSH] opening connection to #{self}")
+        string_to_mask = "[SSH] opening connection to #{self}"
+        masked_string = Util.mask_values(string_to_mask, %w{password ssh_http_proxy_password})
+        logger.debug(masked_string)
         Net::SSH.start(hostname, username, options)
       rescue *rescue_exceptions => e
         retries -= 1

data/lib/kitchen/suite.rb

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require_relative "platform_filter"
+
 module Kitchen
   # A logical configuration representing a test case or fixture that will be
   # executed on a platform.
@@ -41,8 +43,8 @@ module Kitchen
       @name = options.fetch(:name) do
         raise ClientError, "Suite#new requires option :name"
       end
-      @excludes = options.fetch(:excludes, [])
-      @includes = options.fetch(:includes, [])
+      @excludes = PlatformFilter.convert(options.fetch(:excludes, []))
+      @includes = PlatformFilter.convert(options.fetch(:includes, []))
     end
   end
 end

data/lib/kitchen/transport/base.rb

@@ -128,8 +128,8 @@ module Kitchen
             tries += 1
             debug("Attempting to execute command - try #{tries} of #{max_retries}.")
             execute(command)
-          rescue Kitchen::Transport::TransportFailed => e
-            if retry?(tries, max_retries, retryable_exit_codes, e.exit_code)
+          rescue Exception => e
+            if retry?(tries, max_retries, retryable_exit_codes, e)
               close
               sleep wait_time
               retry
@@ -139,10 +139,14 @@ module Kitchen
           end
         end
 
-        def retry?(current_try, max_retries, retryable_exit_codes, exit_code)
-          current_try <= max_retries &&
-            !retryable_exit_codes.nil? &&
-            retryable_exit_codes.flatten.include?(exit_code)
+        def retry?(current_try, max_retries, retryable_exit_codes, exception)
+          if exception.is_a?(Kitchen::Transport::TransportFailed)
+            return current_try <= max_retries &&
+                !retryable_exit_codes.nil? &&
+                retryable_exit_codes.flatten.include?(exception.exit_code)
+          end
+
+          false
         end
 
         # Builds a LoginCommand which can be used to open an interactive