test-kitchen 1.5.0 → 1.6.0

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/spec/kitchen/provisioner/base_spec.rb

@@ -330,6 +330,39 @@ describe Kitchen::Provisioner::Base do
     end
   end
 
+  describe "#sudo_command" do
+
+    describe "with :sudo set" do
+
+      before { config[:sudo] = true }
+
+      it "returns the default sudo_command" do
+        provisioner.send(:sudo_command).must_equal("sudo -E")
+      end
+
+      it "returns the custom sudo_command" do
+        config[:sudo_command] = "mysudo"
+
+        provisioner.send(:sudo_command).must_equal("mysudo")
+      end
+    end
+
+    describe "with :sudo falsey" do
+
+      before { config[:sudo] = false }
+
+      it "returns empty string for default sudo_command" do
+        provisioner.send(:sudo_command).must_equal("")
+      end
+
+      it "returns empty string for custom sudo_command" do
+        config[:sudo_command] = "mysudo"
+
+        provisioner.send(:sudo_command).must_equal("")
+      end
+    end
+  end
+
   describe "#prefix_command" do
 
     describe "with :command_prefix set" do

data/spec/kitchen/provisioner/chef_apply_spec.rb

@@ -0,0 +1,136 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: SAWANOBORI Yukihiko <sawanoboriyu@higanworks.com>)
+#
+# Copyright (C) 2015, HiganWorks LLC
+#
+# 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.
+
+require_relative "../../spec_helper"
+
+require "kitchen"
+require "kitchen/provisioner/chef_apply"
+
+describe Kitchen::Provisioner::ChefApply do
+
+  let(:logged_output)   { StringIO.new }
+  let(:logger)          { Logger.new(logged_output) }
+  let(:platform)        { stub(:os_type => nil) }
+  let(:suite)           { stub(:name => "fries") }
+
+  let(:config) do
+    { :test_base_path => "/b", :kitchen_root => "/r", :log_level => :info }
+  end
+
+  let(:instance) do
+    stub(
+      :name => "coolbeans",
+      :logger => logger,
+      :suite => suite,
+      :platform => platform
+    )
+  end
+
+  let(:provisioner) do
+    Kitchen::Provisioner::ChefApply.new(config).finalize_config!(instance)
+  end
+
+  it "provisioner api_version is 2" do
+    provisioner.diagnose_plugin[:api_version].must_equal 2
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    provisioner.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
+  describe "default config" do
+
+    it "sets :chef_apply_path to a path using :chef_omnibus_root" do
+      config[:chef_omnibus_root] = "/nice/place"
+
+      provisioner[:chef_apply_path].must_equal "/nice/place/bin/chef-apply"
+    end
+  end
+
+  describe "#create_sandbox" do
+
+    before do
+      @root = Dir.mktmpdir
+      config[:kitchen_root] = @root
+    end
+
+    after do
+      FileUtils.remove_entry(@root)
+      begin
+        provisioner.cleanup_sandbox
+      rescue # rubocop:disable Lint/HandleExceptions
+      end
+    end
+  end
+
+  describe "#run_command" do
+
+    before do
+      config[:run_list] = %w[appry_recipe1 appry_recipe2]
+    end
+
+    let(:cmd) { provisioner.run_command }
+
+    describe "for bourne shells" do
+
+      before { platform.stubs(:shell_type).returns("bourne") }
+
+      it "uses bourne shell" do
+        cmd.must_match(/\Ash -c '$/)
+        cmd.must_match(/'\Z/)
+      end
+
+      it "uses sudo for chef-apply when configured" do
+        config[:chef_omnibus_root] = "/c"
+        config[:sudo] = true
+
+        cmd.must_match regexify("sudo -E /c/bin/chef-apply apply/appry_recipe1.rb ", :partial_line)
+        cmd.must_match regexify("sudo -E /c/bin/chef-apply apply/appry_recipe2.rb ", :partial_line)
+      end
+
+      it "does not use sudo for chef-apply when configured" do
+        config[:chef_omnibus_root] = "/c"
+        config[:sudo] = false
+
+        cmd.must_match regexify("chef-apply apply/appry_recipe1.rb ", :partial_line)
+        cmd.must_match regexify("chef-apply apply/appry_recipe2.rb ", :partial_line)
+        cmd.wont_match regexify("sudo -E /c/bin/chef-apply ")
+      end
+
+      it "sets log level flag on chef-apply to auto by default" do
+        cmd.must_match regexify(" --log_level auto", :partial_line)
+      end
+
+      it "set log level flag for custom level" do
+        config[:log_level] = :extreme
+
+        cmd.must_match regexify(" --log_level extreme", :partial_line)
+      end
+
+      it "sets no color flag on chef-apply" do
+        cmd.must_match regexify(" --no-color", :partial_line)
+      end
+    end
+  end
+
+  def regexify(str, line = :whole_line)
+    r = Regexp.escape(str)
+    r = "^\s*#{r}$" if line == :whole_line
+    Regexp.new(r)
+  end
+end

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -150,8 +150,8 @@ describe Kitchen::Provisioner::ChefBase do
 
     let(:install_opts) {
       { :omnibus_url => "https://www.chef.io/chef/install.sh",
-        :project => nil, :install_flags => nil, :http_proxy => nil,
-        :https_proxy => nil }
+        :project => nil, :install_flags => nil, :sudo_command => "sudo -E",
+        :http_proxy => nil, :https_proxy => nil }
     }
 
     it "returns nil if :require_chef_omnibus is falsey" do
@@ -323,17 +323,21 @@ describe Kitchen::Provisioner::ChefBase do
       it "prepends sudo for sh commands when :sudo is set" do
         config[:sudo] = true
         config[:sudo_command] = "my_sudo_command"
+        install_opts_clone = install_opts.clone
+        install_opts_clone[:sudo_command] = config[:sudo_command]
 
         Mixlib::Install.expects(:new).
-          with(default_version, false, install_opts).returns(installer)
+          with(default_version, false, install_opts_clone).returns(installer)
         cmd.must_equal "my_sudo_command my_install_command"
       end
 
       it "does not sudo for sh commands when :sudo is falsey" do
         config[:sudo] = false
 
+        install_opts_clone = install_opts.clone
+        install_opts_clone[:sudo_command] = ""
         Mixlib::Install.expects(:new).
-          with(default_version, false, install_opts).returns(installer)
+          with(default_version, false, install_opts_clone).returns(installer)
         cmd.must_equal "my_install_command"
       end
     end
@@ -347,8 +351,10 @@ describe Kitchen::Provisioner::ChefBase do
       end
 
       it "sets the powershell flag for Mixlib::Install" do
+        install_opts_clone = install_opts.clone
+        install_opts_clone[:sudo_command] = ""
         Mixlib::Install.expects(:new).
-          with("", true, install_opts).returns(installer)
+          with("", true, install_opts_clone).returns(installer)
         cmd
       end
     end

data/spec/kitchen/ssh_spec.rb

@@ -18,7 +18,6 @@
 
 require_relative "../spec_helper"
 
-require "net/ssh/test"
 require "kitchen/ssh"
 require "tmpdir"
 
@@ -55,7 +54,7 @@ end
 # `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
@@ -63,6 +62,10 @@ def depatch_io
     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
@@ -82,7 +85,7 @@ end
 # `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

data/spec/kitchen/transport/ssh_spec.rb

@@ -18,8 +18,6 @@
 
 require_relative "../../spec_helper"
 
-require "net/ssh/test"
-
 require "kitchen/transport/ssh"
 
 # Hack to sort results in `Dir.entries` only within the yielded block, to limit
@@ -55,7 +53,7 @@ end
 # `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
@@ -63,6 +61,10 @@ def depatch_io
     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
@@ -82,7 +84,7 @@ end
 # `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

data/spec/kitchen/transport/winrm_spec.rb

@@ -20,9 +20,7 @@ require_relative "../../spec_helper"
 
 require "kitchen/transport/winrm"
 require "winrm"
-require "winrm/transport/command_executor"
-require "winrm/transport/shell_closer"
-require "winrm/transport/file_transporter"
+require "winrm-fs"
 
 module Kitchen
 
@@ -107,8 +105,8 @@ describe Kitchen::Transport::Winrm do
       transport[:max_wait_until_ready].must_equal 600
     end
 
-    it "sets :winrm_transport to :plaintext" do
-      transport[:winrm_transport].must_equal :plaintext
+    it "sets :winrm_transport to :negotiate" do
+      transport[:winrm_transport].must_equal :negotiate
     end
   end
 
@@ -150,25 +148,17 @@ describe Kitchen::Transport::Winrm do
         make_connection
       end
 
-      it "sets the :winrm_transport to :plaintext" do
+      it "sets the :winrm_transport to :negotiate" do
         klass.expects(:new).with do |hash|
-          hash[:winrm_transport] == :plaintext
+          hash[:winrm_transport] == :negotiate
         end
 
         make_connection
       end
 
-      it "sets the :disable_sspi to true" do
+      it "sets the :disable_sspi to false" do
         klass.expects(:new).with do |hash|
-          hash[:disable_sspi] == true
-        end
-
-        make_connection
-      end
-
-      it "sets the :basic_auth_only to true" do
-        klass.expects(:new).with do |hash|
-          hash[:basic_auth_only] == true
+          hash[:disable_sspi] == false
         end
 
         make_connection
@@ -336,42 +326,20 @@ describe Kitchen::Transport::Winrm do
         make_connection
       end
 
-      describe "when sspinegotiate is set in config" do
+      describe "when negotiate is set in config" do
         before do
-          config[:winrm_transport] = "sspinegotiate"
+          config[:winrm_transport] = "negotiate"
         end
 
-        describe "for Windows workstations" do
-          before do
-            RbConfig::CONFIG.stubs(:[]).with("host_os").returns("mingw32")
-          end
-
-          it "sets :winrm_transport to sspinegotiate on Windows" do
-
-            klass.expects(:new).with do |hash|
-              hash[:winrm_transport] == :sspinegotiate &&
-                hash[:disable_sspi] == false &&
-                hash[:basic_auth_only] == false
-            end
+        it "sets :winrm_transport to negotiate" do
 
-            make_connection
+          klass.expects(:new).with do |hash|
+            hash[:winrm_transport] == :negotiate &&
+              hash[:disable_sspi] == false &&
+              hash[:basic_auth_only] == false
           end
-        end
 
-        describe "for non-Windows workstations" do
-          before do
-            RbConfig::CONFIG.stubs(:[]).with("host_os").returns("darwin14")
-          end
-
-          it "sets :winrm_transport to plaintext" do
-            klass.expects(:new).with do |hash|
-              hash[:winrm_transport] == :plaintext &&
-                hash[:disable_sspi] == true &&
-                hash[:basic_auth_only] == true
-            end
-
-            make_connection
-          end
+          make_connection
         end
       end
 
@@ -438,48 +406,46 @@ describe Kitchen::Transport::Winrm do
   end
 
   describe "#load_needed_dependencies" do
-    describe "winrm-transport" do
+    describe "winrm-fs" do
       before do
-        # force loading of winrm-transport to get the version constant
-        require "winrm/transport/version"
+        # force loading of winrm-fs to get the version constant
+        require "winrm-fs"
       end
 
       it "logs a message to debug that code will be loaded" do
-        transport.stubs(:require)
         transport
 
         logged_output.string.must_match debug_line_with(
-          "Winrm Transport requested, loading WinRM::Transport gem")
+          "winrm-fs requested, loading winrm-fs gem")
       end
 
       it "logs a message to debug when library is initially loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:require)
-        transport.stubs(:execute_block).returns(true)
-
+        transport.stubs(:require).with("winrm", anything)
+        transport.stubs(:require).with("winrm-fs").returns(true)
         transport.finalize_config!(instance)
 
         logged_output.string.must_match(
-          /WinRM::Transport library loaded/
+          /winrm-fs is loaded/
         )
       end
 
       it "logs a message to debug when library is previously loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:require)
-        transport.stubs(:execute_block).returns(false)
-
+        transport.stubs(:require).with("winrm", anything)
+        transport.stubs(:require).with("winrm-fs").returns(false)
         transport.finalize_config!(instance)
 
         logged_output.string.must_match(
-          /WinRM::Transport previously loaded/
+          /winrm-fs was already loaded/
         )
       end
 
       it "logs a message to fatal when libraries cannot be loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:require)
-        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+        transport.stubs(:require).with("winrm", anything)
+        transport.stubs(:require).with("winrm-fs").
+          raises(LoadError, "uh oh")
         begin
           transport.finalize_config!(instance)
         rescue # rubocop:disable Lint/HandleExceptions
@@ -487,64 +453,61 @@ describe Kitchen::Transport::Winrm do
         end
 
         logged_output.string.must_match fatal_line_with(
-          "The `winrm-transport` gem is missing and must be installed")
+          "The `winrm-fs` gem is missing and must be installed")
       end
 
       it "raises a UserError when libraries cannot be loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:require)
-        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+        transport.stubs(:require).with("winrm", anything)
+        transport.stubs(:require).with("winrm-fs").
+          raises(LoadError, "uh oh")
 
         err = proc {
           transport.finalize_config!(instance)
         }.must_raise Kitchen::UserError
-        err.message.must_match(/^Could not load or activate winrm-transport\. /)
+        err.message.must_match(/^Could not load or activate winrm-fs\. /)
       end
     end
 
-    describe "winrm-s" do
-      before do
-        RbConfig::CONFIG.stubs(:[]).with("host_os").returns("mingw32")
-      end
-
+    describe "winrm" do
       it "logs a message to debug that code will be loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:load_winrm_transport!)
+        transport.stubs(:require).with("winrm-fs", anything)
         transport.stubs(:require)
         transport.finalize_config!(instance)
 
         logged_output.string.must_match debug_line_with(
-          "The winrm-s gem is being loaded")
+          "winrm requested, loading winrm gem")
       end
 
       it "logs a message to debug when library is initially loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:load_winrm_transport!)
-        transport.stubs(:execute_block).returns(true)
+        transport.stubs(:require).with("winrm-fs", anything)
+        transport.stubs(:require).returns(true)
 
         transport.finalize_config!(instance)
 
         logged_output.string.must_match(
-          /winrm-s is loaded/
+          /winrm is loaded/
         )
       end
 
       it "logs a message to debug when library is previously loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:load_winrm_transport!)
-        transport.stubs(:execute_block).returns(false)
+        transport.stubs(:require).with("winrm-fs", anything)
+        transport.stubs(:require).returns(false)
 
         transport.finalize_config!(instance)
 
         logged_output.string.must_match(
-          /winrm-s was already loaded/
+          /winrm was already loaded/
         )
       end
 
       it "logs a message to fatal when libraries cannot be loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:load_winrm_transport!)
-        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+        transport.stubs(:require).with("winrm-fs", anything)
+        transport.stubs(:require).raises(LoadError, "uh oh")
         begin
           transport.finalize_config!(instance)
         rescue # rubocop:disable Lint/HandleExceptions
@@ -552,18 +515,18 @@ describe Kitchen::Transport::Winrm do
         end
 
         logged_output.string.must_match fatal_line_with(
-          "The `winrm-s` gem is missing and must be installed")
+          "The `winrm` gem is missing and must be installed")
       end
 
       it "raises a UserError when libraries cannot be loaded" do
         transport = Kitchen::Transport::Winrm.new(config)
-        transport.stubs(:load_winrm_transport!)
-        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+        transport.stubs(:require).with("winrm-fs", anything)
+        transport.stubs(:require).raises(LoadError, "uh oh")
 
         err = proc {
           transport.finalize_config!(instance)
         }.must_raise Kitchen::UserError
-        err.message.must_match(/^Could not load or activate winrm-s\. /)
+        err.message.must_match(/^Could not load or activate winrm\. /)
       end
     end
   end
@@ -602,7 +565,7 @@ describe Kitchen::Transport::Winrm::Connection do
 
   let(:executor) do
     s = mock("command_executor")
-    s.responds_like_instance_of(WinRM::Transport::CommandExecutor)
+    s.responds_like_instance_of(WinRM::CommandExecutor)
     s
   end
 
@@ -611,6 +574,8 @@ describe Kitchen::Transport::Winrm::Connection do
   end
 
   before do
+    WinRM::WinRMWebService.stubs(:new).returns(winrm_session)
+    winrm_session.stubs(:logger=)
     logger.level = Logger::DEBUG
   end
 
@@ -624,29 +589,12 @@ describe Kitchen::Transport::Winrm::Connection do
     end
 
     before do
-      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
-      # disable finalizer as service is a fake anyway
-      ObjectSpace.stubs(:define_finalizer).
-        with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
-      executor.stubs(:open).returns("shell-123")
-      executor.stubs(:shell).returns("shell-123")
+      winrm_session.stubs(:create_executor).returns(executor)
       executor.stubs(:close)
       executor.stubs(:run_powershell_script).
         with("doit").yields("ok\n", nil).returns(response)
     end
 
-    it "logger displays closing connection on debug" do
-      connection.execute("doit")
-      connection.close
-
-      logged_output.string.must_match debug_line(
-        "[WinRM] closing remote shell shell-123 on #{info}"
-      )
-      logged_output.string.must_match debug_line(
-        "[WinRM] remote shell shell-123 closed"
-      )
-    end
-
     it "only closes the shell once for multiple calls" do
       executor.expects(:close).once
 
@@ -660,10 +608,7 @@ describe Kitchen::Transport::Winrm::Connection do
   describe "#execute" do
 
     before do
-      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
-      # disable finalizer as service is a fake anyway
-      ObjectSpace.stubs(:define_finalizer).
-        with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
+      winrm_session.stubs(:create_executor).returns(executor)
     end
 
     describe "for a successful command" do
@@ -679,7 +624,6 @@ describe Kitchen::Transport::Winrm::Connection do
       end
 
       before do
-        executor.expects(:open).returns("shell-123")
         executor.expects(:run_powershell_script).
           with("doit").yields("ok\n", nil).returns(response)
       end
@@ -691,17 +635,6 @@ describe Kitchen::Transport::Winrm::Connection do
           "[WinRM] #{info} (doit)")
       end
 
-      it "logger displays establishing connection on debug" do
-        connection.execute("doit")
-
-        logged_output.string.must_match debug_line(
-          "[WinRM] opening remote shell on #{info}"
-        )
-        logged_output.string.must_match debug_line(
-          "[WinRM] remote shell shell-123 is open on #{info}"
-        )
-      end
-
       it "logger captures stdout" do
         connection.execute("doit")
 
@@ -741,10 +674,9 @@ describe Kitchen::Transport::Winrm::Connection do
       end
 
       before do
-        executor.expects(:open).returns("shell-123")
-        executor.expects(:run_powershell_script).
-          with(%{& "$env:TEMP/kitchen/coolbeans-long_script.ps1"}).
-          yields("ok\n", nil).returns(response)
+        executor.expects(:run_powershell_script).with(
+          %{powershell -ExecutionPolicy Bypass -File "$env:TEMP/kitchen/coolbeans-long_script.ps1"}
+        ).yields("ok\n", nil).returns(response)
       end
 
       it "uploads the long command" do
@@ -786,12 +718,11 @@ describe Kitchen::Transport::Winrm::Connection do
       end
 
       before do
-        executor.expects(:open).returns("shell-123")
         executor.expects(:run_powershell_script).
           with("doit").yields("nope\n", nil).returns(response)
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def self.common_failed_command_specs
         it "logger displays command on debug" do
           begin
@@ -805,21 +736,6 @@ describe Kitchen::Transport::Winrm::Connection do
           )
         end
 
-        it "logger displays establishing connection on debug" do
-          begin
-            connection.execute("doit")
-          rescue # rubocop:disable Lint/HandleExceptions
-            # the raise is not what is being tested here, rather its side-effect
-          end
-
-          logged_output.string.must_match debug_line(
-            "[WinRM] opening remote shell on #{info}"
-          )
-          logged_output.string.must_match debug_line(
-            "[WinRM] remote shell shell-123 is open on #{info}"
-          )
-        end
-
         it "logger captures stdout" do
           begin
             connection.execute("doit")
@@ -854,7 +770,7 @@ MSG
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
 
       describe "when a non-zero exit code is returned" do
 
@@ -897,64 +813,12 @@ MSG
 
           options[:connection_retries] = 3
           options[:connection_retry_sleep] = 7
-          connection.stubs(:sleep)
-          executor.stubs(:open).raises(k)
+          winrm_session.stubs(:create_executor).raises(k)
         end
 
         it "reraises the #{klass} exception" do
           proc { connection.execute("nope") }.must_raise klass
         end
-
-        it "attempts to connect :connection_retries times" do
-          begin
-            connection.execute("nope")
-          rescue # rubocop:disable Lint/HandleExceptions
-            # the raise is not what is being tested here, rather its side-effect
-          end
-
-          logged_output.string.lines.count { |l|
-            l =~ debug_line("[WinRM] opening remote shell on #{info}")
-          }.must_equal 3
-          logged_output.string.lines.count { |l|
-            l =~ debug_line("[WinRM] remote shell shell-123 is open on #{info}")
-          }.must_equal 0
-        end
-
-        it "sleeps for :connection_retry_sleep seconds between retries" do
-          connection.unstub(:sleep)
-          connection.expects(:sleep).with(7).twice
-
-          begin
-            connection.execute("nope")
-          rescue # rubocop:disable Lint/HandleExceptions
-            # the raise is not what is being tested here, rather its side-effect
-          end
-        end
-
-        it "logs the first 2 retry failures on info" do
-          begin
-            connection.execute("nope")
-          rescue # rubocop:disable Lint/HandleExceptions
-            # the raise is not what is being tested here, rather its side-effect
-          end
-
-          logged_output.string.lines.count { |l|
-            l =~ info_line_with(
-              "[WinRM] connection failed, retrying in 7 seconds")
-          }.must_equal 2
-        end
-
-        it "logs the last retry failures on warn" do
-          begin
-            connection.execute("nope")
-          rescue # rubocop:disable Lint/HandleExceptions
-            # the raise is not what is being tested here, rather its side-effect
-          end
-
-          logged_output.string.lines.count { |l|
-            l =~ warn_line_with("[WinRM] connection failed, terminating ")
-          }.must_equal 1
-        end
       end
     end
   end
@@ -1131,38 +995,33 @@ MSG
 
     let(:transporter) do
       t = mock("file_transporter")
-      t.responds_like_instance_of(WinRM::Transport::FileTransporter)
+      t.responds_like_instance_of(WinRM::FS::Core::FileTransporter)
       t
     end
 
     before do
-      # disable finalizer as service is a fake anyway
-      ObjectSpace.stubs(:define_finalizer).
-        with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
+      winrm_session.stubs(:create_executor).returns(executor)
 
-      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
-      executor.stubs(:open)
-
-      WinRM::Transport::FileTransporter.stubs(:new).
-        with(executor, logger).returns(transporter)
+      WinRM::FS::Core::FileTransporter.stubs(:new).
+        with(executor).returns(transporter)
       transporter.stubs(:upload)
     end
 
     def self.common_specs_for_upload
       it "builds a Winrm::FileTransporter" do
-        WinRM::Transport::FileTransporter.unstub(:new)
+        WinRM::FS::Core::FileTransporter.unstub(:new)
 
-        WinRM::Transport::FileTransporter.expects(:new).
-          with(executor, logger).returns(transporter)
+        WinRM::FS::Core::FileTransporter.expects(:new).
+          with(executor).returns(transporter)
 
         upload
       end
 
       it "reuses the Winrm::FileTransporter" do
-        WinRM::Transport::FileTransporter.unstub(:new)
+        WinRM::FS::Core::FileTransporter.unstub(:new)
 
-        WinRM::Transport::FileTransporter.expects(:new).
-          with(executor, logger).returns(transporter).once
+        WinRM::FS::Core::FileTransporter.expects(:new).
+          with(executor).returns(transporter).once
 
         upload
         upload
@@ -1192,49 +1051,8 @@ MSG
   describe "#wait_until_ready" do
 
     before do
-      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
-      # disable finalizer as service is a fake anyway
-      ObjectSpace.stubs(:define_finalizer).
-        with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
+      winrm_session.stubs(:create_executor).returns(executor)
       options[:max_wait_until_ready] = 300
-      connection.stubs(:sleep)
-    end
-
-    describe "when failing to connect" do
-
-      before do
-        executor.stubs(:open).raises(Errno::ECONNREFUSED)
-      end
-
-      it "attempts to connect :max_wait_until_ready / 3 times if failing" do
-        begin
-          connection.wait_until_ready
-        rescue # rubocop:disable Lint/HandleExceptions
-          # the raise is not what is being tested here, rather its side-effect
-        end
-
-        logged_output.string.lines.count { |l|
-          l =~ info_line_with(
-            "Waiting for WinRM service on http://foo:5985/wsman, retrying in 3 seconds")
-        }.must_equal((300 / 3) - 1)
-        logged_output.string.lines.count { |l|
-          l =~ debug_line_with("[WinRM] connection failed ")
-        }.must_equal((300 / 3) - 1)
-        logged_output.string.lines.count { |l|
-          l =~ warn_line_with("[WinRM] connection failed, terminating ")
-        }.must_equal 1
-      end
-
-      it "sleeps for 3 seconds between retries" do
-        connection.unstub(:sleep)
-        connection.expects(:sleep).with(3).times((300 / 3) - 1)
-
-        begin
-          connection.wait_until_ready
-        rescue # rubocop:disable Lint/HandleExceptions
-          # the raise is not what is being tested here, rather its side-effect
-        end
-      end
     end
 
     describe "when connection is successful" do
@@ -1247,7 +1065,6 @@ MSG
       end
 
       before do
-        executor.stubs(:open).returns("shell-123")
         executor.expects(:run_powershell_script).
           with("Write-Host '[WinRM] Established\n'").returns(response)
       end
@@ -1267,7 +1084,6 @@ MSG
       end
 
       before do
-        executor.stubs(:open).returns("shell-123")
         executor.expects(:run_powershell_script).
           with("Write-Host '[WinRM] Established\n'").returns(response)
       end