test-kitchen 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e95e51c6bf2e3482aca5017ef96006b8d82d6f5a
-  data.tar.gz: 3cc56b56d99515ed00fab641da8c7c68b4bd70b7
+  metadata.gz: 35d190e1e4d808396433a878cc3f83cea4e471ba
+  data.tar.gz: 7473ada16496b8f037c6f747620b183901f17f39
 SHA512:
-  metadata.gz: 41b9da6c8f8b9542e403d2ba7c5635b995f25584de30f7509eb8f7578e3f53fd6e3b3f3fb7375ab850dc6ef84487f8d3e2a32e41bb63e3eb1d75786a69dfd37a
-  data.tar.gz: b319d0a90a69e4a3edd62ec7a48f54f14ed2b7b3ede36c14b6906aadfbc947ef8239eb18a1f270fb6c6cc2c462db1a8afab5b40d4f6e82485358a379cac21522
+  metadata.gz: f1749a54b16c555e6fbe7ff610daf75b028a9978a47057a55edb46c97a2629a808fac08f476741d092135ff92439ac2949ea763813b81b19f80c1885b9c704c2
+  data.tar.gz: 0737791415771c2ccfc7295686e83cd1c195fd515e628fc6d61752a0ba0821655498dafda61ca8c1fd907d79032595470be1b2de48b7b0fc39151b19c81cab75

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - ruby-head
 
 env:

data/CHANGELOG.md

@@ -1,9 +1,53 @@
 # Change Log
 
+## [v1.16.0](https://github.com/test-kitchen/test-kitchen/tree/v1.16.0) (2017-03-03)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.15.0...v1.16.0)
+
+**Implemented enhancements:**
+
+- Enforce suite idempotency [\#874](https://github.com/test-kitchen/test-kitchen/issues/874)
+- Export no\_proxy from kitchen config [\#1178](https://github.com/test-kitchen/test-kitchen/pull/1178) ([itmustbejj](https://github.com/itmustbejj))
+- Adding transport option "ssh\_key\_only". [\#1141](https://github.com/test-kitchen/test-kitchen/pull/1141) ([cliles](https://github.com/cliles))
+- Run chef-client twice in chef-zero provisioner [\#875](https://github.com/test-kitchen/test-kitchen/pull/875) ([kamaradclimber](https://github.com/kamaradclimber))
+
+**Fixed bugs:**
+
+- Pinning thor to match berks [\#1189](https://github.com/test-kitchen/test-kitchen/pull/1189) ([cheeseplus](https://github.com/cheeseplus))
+
+**Closed issues:**
+
+- Message: Could not load the 'ansible\_playbook' provisioner from the load path [\#1197](https://github.com/test-kitchen/test-kitchen/issues/1197)
+- pull or push in a docker registry with kitchen [\#1186](https://github.com/test-kitchen/test-kitchen/issues/1186)
+- Compat issues with net-ssh 4.x [\#1184](https://github.com/test-kitchen/test-kitchen/issues/1184)
+- Changelog was not updated for the 1.15.0 release [\#1183](https://github.com/test-kitchen/test-kitchen/issues/1183)
+- Could not load or activate Berkshelf [\#1172](https://github.com/test-kitchen/test-kitchen/issues/1172)
+- WinRm - I/O Operation Aborted [\#1142](https://github.com/test-kitchen/test-kitchen/issues/1142)
+- Guest hostname does not get set if converge times out during vagrant VM boot [\#1128](https://github.com/test-kitchen/test-kitchen/issues/1128)
+- I'm trying to run kitchen converge but getting the converge IO error [\#1075](https://github.com/test-kitchen/test-kitchen/issues/1075)
+- Documentation for support for Encrypted Data Bags [\#384](https://github.com/test-kitchen/test-kitchen/issues/384)
+
+## [v1.15.0](https://github.com/test-kitchen/test-kitchen/tree/v1.15.0) (2017-01-12)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.14.2...v1.15.0)
+
+**Implemented enhancements:**
+
+- Display the last action's success [\#1124](https://github.com/test-kitchen/test-kitchen/issues/1124)
+- Relax dependencies to bring in newer gem versions [\#1176](https://github.com/test-kitchen/test-kitchen/pull/1176) ([lamont-granquist](https://github.com/lamont-granquist))
+- Make RakeTask\#config public. [\#1069](https://github.com/test-kitchen/test-kitchen/pull/1069) ([gregsymons](https://github.com/gregsymons))
+
+**Fixed bugs:**
+
+- Fix busser trying to run bats when bats tests don't exist [\#1133](https://github.com/test-kitchen/test-kitchen/pull/1133) ([amontalban](https://github.com/amontalban))
+
+**Closed issues:**
+
+- "incompatible character encodings: UTF-8 and ASCII-8BIT" when using cyrillic letters in cookbook [\#1170](https://github.com/test-kitchen/test-kitchen/issues/1170)
+- ssh\_key is not read and sent to the args for ssh transport [\#1169](https://github.com/test-kitchen/test-kitchen/issues/1169)
+
 ## [v1.14.2](https://github.com/test-kitchen/test-kitchen/tree/v1.14.2) (2016-12-09)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.14.1...v1.14.2)
 
-**Merged pull requests:**
+**Implemented enhancements:**
 
 - Replace finstyle in favor of chefstyle [\#1166](https://github.com/test-kitchen/test-kitchen/pull/1166) ([afiune](https://github.com/afiune))
 

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 gem "rack", "< 2.0"
 
-gem "train", "~> 0.19.0"
+gem "train", "~> 0.22"
 
 group :integration do
   gem "berkshelf", "~> 4.3"

data/Rakefile

@@ -37,7 +37,7 @@ begin
     task.options += ["--display-cop-names", "--no-color"]
   end
 rescue LoadError
-  puts "finstyle/rubocop is not available.  gem install finstyle to do style checking."
+  puts "chefstyle is not available.  gem install chefstyle to do style checking."
 end
 
 desc "Run all quality tasks"

data/lib/kitchen/command/console.rb

@@ -46,7 +46,7 @@ module Kitchen
           [
             "[#{pry.input_array.size}] ",
             "kc(#{Pry.view_clip(target_self.class)})",
-            "#{":#{nest_level}" unless nest_level.zero?}#{char} ",
+            "#{":#{nest_level}" unless nest_level == 0}#{char} ",
           ].join
         end
       end

data/lib/kitchen/configurable.rb

@@ -309,7 +309,7 @@ module Kitchen
     end
 
     def env_wrapped(code)
-      code_parts = proxy_settings
+      code_parts = resolve_proxy_settings_from_config
       code_parts << shell_env_var("TEST_KITCHEN", 1)
       code_parts << shell_env_var("CI", ENV["CI"]) if ENV["CI"]
       code_parts << code
@@ -317,7 +317,7 @@ module Kitchen
     end
 
     def proxy_setting_keys
-      [:http_proxy, :https_proxy, :ftp_proxy]
+      [:http_proxy, :https_proxy, :ftp_proxy, :no_proxy]
     end
 
     def resolve_proxy_settings_from_config
@@ -331,19 +331,6 @@ module Kitchen
       end
     end
 
-    def proxy_settings
-      env = resolve_proxy_settings_from_config
-
-      # if http_proxy was set from environment variable or https_proxy was set
-      # from environment variable, or ftp_proxy was set from environment
-      # variable, include no_proxy environment variable, if set.
-      if !proxy_from_config? && proxy_from_environment?
-        env << shell_env_var("no_proxy", ENV["no_proxy"]) if ENV["no_proxy"]
-        env << shell_env_var("NO_PROXY", ENV["NO_PROXY"]) if ENV["NO_PROXY"]
-      end
-      env
-    end
-
     def proxy_from_config?
       proxy_setting_keys.any? do |protocol|
         !config[protocol].nil?

data/lib/kitchen/provisioner/chef_base.rb

@@ -67,6 +67,10 @@ module Kitchen
       # to ease upgrades, allow the user to turn deprecation warnings into errors
       default_config :deprecations_as_errors, false
 
+      default_config :multiple_converge, 1
+
+      default_config :enforce_idempotency, false
+
       default_config :data_path do |provisioner|
         provisioner.calculate_path("data")
       end
@@ -150,6 +154,10 @@ module Kitchen
 
       private
 
+      def last_exit_code
+        "; exit $LastExitCode" if powershell_shell?
+      end
+
       # @return [Hash] an option hash for the install commands
       # @api private
       def install_options
@@ -393,6 +401,90 @@ module Kitchen
             "#{policyfile}"
         end
       end
+
+      # Writes a configuration file to the sandbox directory.
+      # @api private
+      def prepare_config_rb
+        data = default_config_rb.merge(config[config_filename.tr(".", "_").to_sym])
+        data = data.merge(:named_run_list => config[:named_run_list]) if config[:named_run_list]
+
+        info("Preparing #{config_filename}")
+        debug("Creating #{config_filename} from #{data.inspect}")
+
+        File.open(File.join(sandbox_path, config_filename), "wb") do |file|
+          file.write(format_config_file(data))
+        end
+
+        prepare_config_idempotency_check if config[:enforce_idempotency]
+      end
+
+      # Writes a configuration file to the sandbox directory
+      # to check for idempotency of the run.
+      # @api private
+      def prepare_config_idempotency_check
+        handler_filename = "chef-client-fail-if-update-handler.rb"
+        source = File.join(
+          File.dirname(__FILE__), %w{.. .. .. support }, handler_filename
+        )
+        FileUtils.cp(source, File.join(sandbox_path, handler_filename))
+        File.open(File.join(sandbox_path, "client_no_updated_resources.rb"), "wb") do |file|
+          file.write(format_config_file(data))
+          file.write("\n\n")
+          file.write("handler_file = File.join(File.dirname(__FILE__), '#{handler_filename}')\n")
+          file.write "Chef::Config.from_file(handler_file)\n"
+        end
+      end
+
+      # Returns an Array of command line arguments for the chef client.
+      #
+      # @return [Array<String>] an array of command line arguments
+      # @api private
+      def chef_args(_config_filename)
+        raise "You must override in sub classes!"
+      end
+
+      # Returns a filename for the configuration file
+      # defaults to client.rb
+      #
+      # @return [String] a filename
+      # @api private
+      def config_filename
+        "client.rb"
+      end
+
+      # Gives the command used to run chef
+      # @api private
+      def chef_cmd(base_cmd)
+        if windows_os?
+          separator = [
+            "; if ($LastExitCode -ne 0) { ",
+            "throw \"Command failed with exit code $LastExitCode.\" } ;",
+          ].join
+        else
+          separator = " && "
+        end
+        chef_cmds(base_cmd).join(separator)
+      end
+
+      # Gives an array of command
+      # @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
+        end
+        cmds
+      end
     end
   end
 end

data/lib/kitchen/provisioner/chef_solo.rb

@@ -36,10 +36,15 @@ module Kitchen
           .tap { |path| path.concat(".bat") if provisioner.windows_os? }
       end
 
+      # (see Base#config_filename)
+      def config_filename
+        "solo.rb"
+      end
+
       # (see Base#create_sandbox)
       def create_sandbox
         super
-        prepare_solo_rb
+        prepare_config_rb
       end
 
       def modern?
@@ -58,13 +63,23 @@ module Kitchen
       end
 
       # (see Base#run_command)
-      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
       def run_command
         config[:log_level] = "info" if !modern? && config[:log_level] = "auto"
         cmd = sudo(config[:chef_solo_path]).dup
                                            .tap { |str| str.insert(0, "& ") if powershell_shell? }
+
+        chef_cmd(cmd)
+      end
+
+      private
+
+      # Returns an Array of command line arguments for the chef client.
+      #
+      # @return [Array<String>] an array of command line arguments
+      # @api private
+      def chef_args(solo_rb_filename)
         args = [
-          "--config #{remote_path_join(config[:root_path], 'solo.rb')}",
+          "--config #{remote_path_join(config[:root_path], solo_rb_filename)}",
           "--log_level #{config[:log_level]}",
           "--no-color",
           "--json-attributes #{remote_path_join(config[:root_path], 'dna.json')}",
@@ -74,28 +89,7 @@ module Kitchen
         args << "--profile-ruby" if config[:profile_ruby]
         args << "--legacy-mode" if config[:legacy_mode]
 
-        prefix_command(
-          wrap_shell_code(
-            [cmd, *args].join(" ")
-            .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-          )
-        )
-      end
-
-      private
-
-      # Writes a solo.rb configuration file to the sandbox directory.
-      #
-      # @api private
-      def prepare_solo_rb
-        data = default_config_rb.merge(config[:solo_rb])
-
-        info("Preparing solo.rb")
-        debug("Creating solo.rb from #{data.inspect}")
-
-        File.open(File.join(sandbox_path, "solo.rb"), "wb") do |file|
-          file.write(format_config_file(data))
-        end
+        args
       end
     end
   end

data/lib/kitchen/provisioner/chef_zero.rb

@@ -50,7 +50,7 @@ module Kitchen
         super
         prepare_chef_client_zero_rb
         prepare_validation_pem
-        prepare_client_rb
+        prepare_config_rb
       end
 
       # (see Base#prepare_command)
@@ -71,20 +71,11 @@ module Kitchen
       def run_command
         cmd = modern? ? local_mode_command : shim_command
 
-        prefix_command(
-          wrap_shell_code(
-            [cmd, *chef_client_args, last_exit_code].join(" ")
-            .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-          )
-        )
+        chef_cmd(cmd)
       end
 
       private
 
-      def last_exit_code
-        "; exit $LastExitCode" if powershell_shell?
-      end
-
       # Adds optional flags to a chef-client command, depending on
       # configuration data. Note that this method mutates the incoming Array.
       #
@@ -115,10 +106,10 @@ module Kitchen
       #
       # @return [Array<String>] an array of command line arguments
       # @api private
-      def chef_client_args
+      def chef_args(client_rb_filename)
         level = config[:log_level]
         args = [
-          "--config #{remote_path_join(config[:root_path], 'client.rb')}",
+          "--config #{remote_path_join(config[:root_path], client_rb_filename)}",
           "--log_level #{level}",
           "--force-formatter",
           "--no-color",
@@ -200,21 +191,6 @@ module Kitchen
         FileUtils.cp(source, File.join(sandbox_path, "chef-client-zero.rb"))
       end
 
-      # Writes a client.rb configuration file to the sandbox directory.
-      #
-      # @api private
-      def prepare_client_rb
-        data = default_config_rb.merge(config[:client_rb])
-        data = data.merge(named_run_list: config[:named_run_list]) if config[:named_run_list]
-
-        info("Preparing client.rb")
-        debug("Creating client.rb from #{data.inspect}")
-
-        File.open(File.join(sandbox_path, "client.rb"), "wb") do |file|
-          file.write(format_config_file(data))
-        end
-      end
-
       # Writes a fake (but valid) validation.pem into the sandbox directory.
       #
       # @api private

data/lib/kitchen/transport/ssh.rb

@@ -416,6 +416,10 @@ module Kitchen
           opts[:auth_methods] = ["publickey"]
         end
 
+        if data[:ssh_key_only]
+          opts[:auth_methods] = ["publickey"]
+        end
+
         opts[:password] = data[:password]           if data.key?(:password)
         opts[:forward_agent] = data[:forward_agent] if data.key?(:forward_agent)
         opts[:verbose] = data[:verbose].to_sym      if data.key?(:verbose)

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.15.0".freeze
+  VERSION = "1.16.0".freeze
 end

data/spec/kitchen/configurable_spec.rb

@@ -767,6 +767,7 @@ describe Kitchen::Configurable do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
         config[:ftp_proxy] = "ftp://proxy"
+        config[:no_proxy] = "http://no"
 
         cmd.must_equal(outdent!(<<-CODE.chomp))
           sh -c '
@@ -776,6 +777,8 @@ describe Kitchen::Configurable do
           HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
           ftp_proxy="ftp://proxy"; export ftp_proxy
           FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          no_proxy="http://no"; export no_proxy
+          NO_PROXY="http://no"; export NO_PROXY
           TEST_KITCHEN="1"; export TEST_KITCHEN
           mkdir foo
           '

data/spec/kitchen/provisioner/chef_solo_spec.rb

@@ -313,6 +313,18 @@ describe Kitchen::Provisioner::ChefSolo do
         cmd.must_match(/'\Z/)
       end
 
+      it "contains a standard second run if multiple_converge is set to 2" do
+        config[:multiple_converge] = 2
+        cmd.must_match(/chef-solo.*&&.*chef-solo.*/m)
+        cmd.wont_match(/chef-solo.*&&.*chef-solo.*client_no_updated_resources.rb/m)
+      end
+
+      it "contains a specific second run if enforce_idempotency is set" do
+        config[:multiple_converge] = 2
+        config[:enforce_idempotency] = true
+        cmd.must_match(/chef-solo.*&&.*chef-solo.*client_no_updated_resources.rb/m)
+      end
+
       it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
         config[:http_proxy] = "http://proxy"
 
@@ -454,6 +466,18 @@ describe Kitchen::Provisioner::ChefSolo do
         platform.stubs(:os_type).returns("windows")
       end
 
+      it "contains a standard second run if multiple_converge is set to 2" do
+        config[:multiple_converge] = 2
+        cmd.must_match(/chef-solo.*;.*chef-solo.*/m)
+        cmd.wont_match(/chef-solo.*;.*chef-solo.*client_no_updated_resources.rb/m)
+      end
+
+      it "contains a specific second run if enforce_idempotency is set" do
+        config[:multiple_converge] = 2
+        config[:enforce_idempotency] = true
+        cmd.must_match(/chef-solo.*;.*chef-solo.*client_no_updated_resources.rb/m)
+      end
+
       it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
         config[:http_proxy] = "http://proxy"
 

data/spec/kitchen/provisioner/chef_zero_spec.rb

@@ -700,6 +700,18 @@ describe Kitchen::Provisioner::ChefZero do
           cmd.must_match(/'\Z/)
         end
 
+        it "contains a standard second run if multiple_converge is set to 2" do
+          config[:multiple_converge] = 2
+          cmd.must_match(/chef-client.*&&.*chef-client.*/m)
+          cmd.wont_match(/chef-client.*&&.*chef-client.*client_no_updated_resources.rb/m)
+        end
+
+        it "contains a specific second run if enforce_idempotency is set" do
+          config[:multiple_converge] = 2
+          config[:enforce_idempotency] = true
+          cmd.must_match(/chef-client.*&&.*chef-client.*client_no_updated_resources.rb/m)
+        end
+
         it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
           config[:http_proxy] = "http://proxy"
 
@@ -763,6 +775,18 @@ describe Kitchen::Provisioner::ChefZero do
         common_shell_specs
         common_modern_shell_specs
 
+        it "contains a standard second run if multiple_converge is set to 2" do
+          config[:multiple_converge] = 2
+          cmd.must_match(/chef-client.*;.*chef-client.*/m)
+          cmd.wont_match(/chef-client.*;.*chef-client.*client_no_updated_resources.rb/m)
+        end
+
+        it "contains a specific second run if enforce_idempotency is set" do
+          config[:multiple_converge] = 2
+          config[:enforce_idempotency] = true
+          cmd.must_match(/chef-client.*;.*chef-client.*client_no_updated_resources.rb/m)
+        end
+
         it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
           config[:http_proxy] = "http://proxy"
 

data/spec/kitchen/ssh_spec.rb

@@ -20,6 +20,7 @@ require_relative "../spec_helper"
 
 require "kitchen/ssh"
 require "tmpdir"
+require "net/ssh/test"
 
 # Hack to sort results in `Dir.entries` only within the yielded block, to limit
 # the "behavior pollution" to other code. This was needed for Net::SCP, as
@@ -50,67 +51,6 @@ def with_sorted_dir_entries
   end
 end
 
-# Terrible hack to deal with Net::SSH:Test::Extensions which monkey patches
-# `IO.select` with a version for testing Net::SSH code. Unfortunetly this
-# impacts other code, so we'll "un-patch" this after each spec and "re-patch"
-# it before the next one.
-require "net/ssh/test"
-def depatch_io
-  IO.class_exec do
-    class << self
-      alias_method :select, :select_for_real
-    end
-  end
-end
-# We need to immediately call depatch so that `IO.select` is in a good state
-# _right now_.  The require immediately monkeypatches it and we only want
-# it monkey patched inside each ssh test
-depatch_io
-
-def repatch_io
-  IO.class_exec do
-    class << self
-      alias_method :select, :select_for_test
-    end
-  end
-end
-
-# Major hack-and-a-half to add basic `Channel#request_pty` support to
-# Net::SSH's testing framework. The `Net::SSH::Test::LocalPacket` does not
-# recognize the `"pty-req"` request type, so bombs out whenever this channel
-# request is sent.
-#
-# This "make-work" fix adds a method (`#sends_request_pty`) which works just
-# like `#sends_exec` expcept that it enqueues a patched subclass of
-# `LocalPacket` which can deal with the `"pty-req"` type.
-#
-# An upstream patch to Net::SSH will be required to retire this yak shave ;)
-require "net/ssh/test/channel"
-module Net
-  module SSH
-    module Test
-      class Channel
-        def sends_request_pty
-          pty_data = ["xterm", 80, 24, 640, 480, "\0"]
-
-          script.events << Class.new(Net::SSH::Test::LocalPacket) do
-            def types # rubocop:disable Lint/NestedMethodDefinition
-              if @type == 98 && @data[1] == "pty-req"
-                @types ||= [
-                  :long, :string, :bool, :string,
-                  :long, :long, :long, :long, :string
-                ]
-              else
-                super
-              end
-            end
-          end.new(:channel_request, remote_id, "pty-req", false, *pty_data)
-        end
-      end
-    end
-  end
-end
-
 describe Kitchen::SSH do
   include Net::SSH::Test
 
@@ -118,19 +58,14 @@ describe Kitchen::SSH do
   let(:logger)        { Logger.new(logged_output) }
   let(:opts)          { Hash.new }
   let(:ssh)           { Kitchen::SSH.new("foo", "me", opts) }
-  let(:conn)          { connection }
+  let(:conn)          { Net::SSH::Test::Extensions::IO.with_test_extension { connection } }
 
   before do
-    repatch_io
     logger.level = Logger::DEBUG
     opts[:logger] = logger
     Net::SSH.stubs(:start).returns(conn)
   end
 
-  after do
-    depatch_io
-  end
-
   describe "establishing a connection" do
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
@@ -293,7 +228,7 @@ describe Kitchen::SSH do
       end
 
       it "raises an SSHFailed exception" do
-        err = proc { ssh.exec("doit") }.must_raise Kitchen::SSHFailed
+        err = proc { assert_scripted { ssh.exec("doit") } }.must_raise Kitchen::SSHFailed
         err.message.must_equal "SSH exited (42) for command: [doit]"
       end
     end
@@ -479,8 +414,10 @@ describe Kitchen::SSH do
     it "shuts down the connection when block closes" do
       conn.expects(:shutdown!)
 
-      Kitchen::SSH.new("foo", "me", opts) do |ssh|
-        ssh.exec("doit")
+      Net::SSH::Test::Extensions::IO.with_test_extension do
+        Kitchen::SSH.new("foo", "me", opts) do |ssh|
+          ssh.exec("doit")
+        end
       end
     end
   end
@@ -576,16 +513,18 @@ describe Kitchen::SSH do
     it "returns a truthy value" do
       TCPSocket.stubs(:new).returns(tcp_socket)
 
-      result = ssh.send(:test_ssh)
-      result.wont_equal nil
-      result.wont_equal false
+      Net::SSH::Test::Extensions::IO.with_test_extension do
+        result = ssh.send(:test_ssh)
+        result.wont_equal nil
+        result.wont_equal false
+      end
     end
 
     it "closes socket when finished" do
       TCPSocket.stubs(:new).returns(tcp_socket)
       tcp_socket.expects(:close)
 
-      ssh.send(:test_ssh)
+      Net::SSH::Test::Extensions::IO.with_test_extension { ssh.send(:test_ssh) }
     end
 
     [
@@ -631,7 +570,7 @@ describe Kitchen::SSH do
 
     it "logs to info for each retry" do
       TCPSocket.stubs(:new).returns(not_ready, not_ready, ready)
-      ssh.wait
+      Net::SSH::Test::Extensions::IO.with_test_extension { ssh.wait }
 
       logged_output.string.lines.count do |l|
         l =~ info_line_with("Waiting for foo:22...")

data/spec/kitchen/transport/ssh_spec.rb

@@ -19,6 +19,7 @@
 require_relative "../../spec_helper"
 
 require "kitchen/transport/ssh"
+require "net/ssh/test"
 
 # Hack to sort results in `Dir.entries` only within the yielded block, to limit
 # the "behavior pollution" to other code. This was needed for Net::SCP, as
@@ -49,67 +50,6 @@ def with_sorted_dir_entries
   end
 end
 
-# Terrible hack to deal with Net::SSH:Test::Extensions which monkey patches
-# `IO.select` with a version for testing Net::SSH code. Unfortunetly this
-# impacts other code, so we'll "un-patch" this after each spec and "re-patch"
-# it before the next one.
-require "net/ssh/test"
-def depatch_io
-  IO.class_exec do
-    class << self
-      alias_method :select, :select_for_real
-    end
-  end
-end
-# We need to immediately call depatch so that `IO.select` is in a good state
-# _right now_.  The require immediately monkeypatches it and we only want
-# it monkey patched inside each ssh test
-depatch_io
-
-def repatch_io
-  IO.class_exec do
-    class << self
-      alias_method :select, :select_for_test
-    end
-  end
-end
-
-# Major hack-and-a-half to add basic `Channel#request_pty` support to
-# Net::SSH's testing framework. The `Net::SSH::Test::LocalPacket` does not
-# recognize the `"pty-req"` request type, so bombs out whenever this channel
-# request is sent.
-#
-# This "make-work" fix adds a method (`#sends_request_pty`) which works just
-# like `#sends_exec` expcept that it enqueues a patched subclass of
-# `LocalPacket` which can deal with the `"pty-req"` type.
-#
-# An upstream patch to Net::SSH will be required to retire this yak shave ;)
-require "net/ssh/test/channel"
-module Net
-  module SSH
-    module Test
-      class Channel
-        def sends_request_pty
-          pty_data = ["xterm", 80, 24, 640, 480, "\0"]
-
-          script.events << Class.new(Net::SSH::Test::LocalPacket) do
-            def types # rubocop:disable Lint/NestedMethodDefinition
-              if @type == 98 && @data[1] == "pty-req"
-                @types ||= [
-                  :long, :string, :bool, :string,
-                  :long, :long, :long, :long, :string
-                ]
-              else
-                super
-              end
-            end
-          end.new(:channel_request, remote_id, "pty-req", false, *pty_data)
-        end
-      end
-    end
-  end
-end
-
 describe Kitchen::Transport::Ssh do
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
@@ -121,7 +61,7 @@ describe Kitchen::Transport::Ssh do
   end
 
   let(:transport) do
-    Kitchen::Transport::Ssh.new(config).finalize_config!(instance)
+    Net::SSH::Test::Extensions::IO.with_test_extension { Kitchen::Transport::Ssh.new(config).finalize_config!(instance) }
   end
 
   it "provisioner api_version is 1" do
@@ -195,6 +135,10 @@ describe Kitchen::Transport::Ssh do
       transport[:ssh_key].must_equal nil
     end
 
+    it "sets :ssh_key_only to nil by default" do
+      transport[:ssh_key_only].must_equal nil
+    end
+
     it "expands :ssh_path path if set" do
       config[:kitchen_root] = "/rooty"
       config[:ssh_key] = "my_key"
@@ -582,6 +526,16 @@ describe Kitchen::Transport::Ssh do
         make_connection
       end
 
+      it "sets :auth_methods to only publickey if :ssh_key_only is set in config" do
+        config[:ssh_key_only] = true
+
+        klass.expects(:new).with do |hash|
+          hash[:auth_methods] == ["publickey"]
+        end
+
+        make_connection
+      end
+
       it "passes in :password if set in config" do
         config[:password] = "password_from_config"
 
@@ -697,7 +651,7 @@ describe Kitchen::Transport::Ssh::Connection do
 
   let(:logged_output)   { StringIO.new }
   let(:logger)          { Logger.new(logged_output) }
-  let(:conn)            { net_ssh_connection }
+  let(:conn)            { Net::SSH::Test::Extensions::IO.with_test_extension { net_ssh_connection } }
 
   let(:options) do
     {
@@ -714,15 +668,10 @@ describe Kitchen::Transport::Ssh::Connection do
   end
 
   before do
-    repatch_io
     logger.level = Logger::DEBUG
     Net::SSH.stubs(:start).returns(conn)
   end
 
-  after do
-    depatch_io
-  end
-
   describe "establishing a connection" do
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
@@ -938,14 +887,14 @@ describe Kitchen::Transport::Ssh::Connection do
 
       it "raises an SshFailed exception" do
         err = proc do
-          connection.execute("doit")
+          assert_scripted { connection.execute("doit") }
         end.must_raise Kitchen::Transport::SshFailed
         err.message.must_equal "SSH exited (42) for command: [doit]"
       end
 
       it "returns the exit code with an SshFailed exception" do
         begin
-          connection.execute("doit")
+          assert_scripted { connection.execute("doit") }
         rescue Kitchen::Transport::SshFailed => e
           e.exit_code.must_equal 42
         end

data/support/chef-client-fail-if-update-handler.rb

@@ -0,0 +1,15 @@
+# Handler to kill the run if any resource is updated
+class UpdatedResources < ::Chef::Handler
+  def report
+    if updated_resources.size > 0
+      puts "First chef run should have reached a converged state."
+      puts "Resources updated in a second chef-client run:"
+      updated_resources.each do |r|
+        puts "- #{r}"
+      end
+      # exit 203 # chef handler catch Exception instead of StandardException
+      Process.kill("KILL", Process.pid)
+    end
+  end
+end
+report_handlers << UpdatedResources.new

data/test-kitchen.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "net-ssh",         ">= 2.9", "< 5.0"
   gem.add_dependency "net-ssh-gateway", "~> 1.2"
   gem.add_dependency "safe_yaml",       "~> 1.0"
-  gem.add_dependency "thor",            "~> 0.18"
+  gem.add_dependency "thor",            "~> 0.19", "< 0.19.2"
   gem.add_dependency "mixlib-install",  ">= 1.2", "< 3.0"
 
   gem.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -98,14 +98,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: mixlib-install
   requirement: !ruby/object:Gem::Requirement
@@ -584,6 +590,7 @@ files:
 - spec/support/powershell_max_size_spec.rb
 - support/busser_install_command.ps1
 - support/busser_install_command.sh
+- support/chef-client-fail-if-update-handler.rb
 - support/chef-client-zero.rb
 - support/chef_base_init_command.ps1
 - support/chef_base_init_command.sh
@@ -634,7 +641,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure