test-kitchen 1.4.2 → 1.5.0

data/spec/kitchen/provisioner/shell_spec.rb

@@ -119,15 +119,27 @@ describe Kitchen::Provisioner::Shell do
         ])
       end
 
-      it "exports all http proxy variables when both are set" do
+      it "exports ftp_proxy & FTP_PROXY when :ftp_proxy is set" do
+        config[:ftp_proxy] = "ftp://proxy"
+
+        cmd.lines.to_a[1..2].must_equal([
+          %{ftp_proxy="ftp://proxy"; export ftp_proxy\n},
+          %{FTP_PROXY="ftp://proxy"; export FTP_PROXY\n}
+        ])
+      end
+
+      it "exports all proxy variables when all are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
 
-        cmd.lines.to_a[1..4].must_equal([
+        cmd.lines.to_a[1..6].must_equal([
           %{http_proxy="http://proxy"; export http_proxy\n},
           %{HTTP_PROXY="http://proxy"; export HTTP_PROXY\n},
           %{https_proxy="https://proxy"; export https_proxy\n},
-          %{HTTPS_PROXY="https://proxy"; export HTTPS_PROXY\n}
+          %{HTTPS_PROXY="https://proxy"; export HTTPS_PROXY\n},
+          %{ftp_proxy="ftp://proxy"; export ftp_proxy\n},
+          %{FTP_PROXY="ftp://proxy"; export FTP_PROXY\n}
         ])
       end
 
@@ -184,15 +196,27 @@ describe Kitchen::Provisioner::Shell do
         ])
       end
 
-      it "exports all http proxy variables when both are set" do
+      it "exports ftp_proxy & FTP_PROXY when :ftp_proxy is set" do
+        config[:ftp_proxy] = "ftp://proxy"
+
+        cmd.lines.to_a[0..1].must_equal([
+          %{$env:ftp_proxy = "ftp://proxy"\n},
+          %{$env:FTP_PROXY = "ftp://proxy"\n}
+        ])
+      end
+
+      it "exports all proxy variables when all are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
 
-        cmd.lines.to_a[0..3].must_equal([
+        cmd.lines.to_a[0..5].must_equal([
           %{$env:http_proxy = "http://proxy"\n},
           %{$env:HTTP_PROXY = "http://proxy"\n},
           %{$env:https_proxy = "https://proxy"\n},
-          %{$env:HTTPS_PROXY = "https://proxy"\n}
+          %{$env:HTTPS_PROXY = "https://proxy"\n},
+          %{$env:ftp_proxy = "ftp://proxy"\n},
+          %{$env:FTP_PROXY = "ftp://proxy"\n}
         ])
       end
 
@@ -253,15 +277,27 @@ describe Kitchen::Provisioner::Shell do
         ])
       end
 
-      it "exports all http proxy variables when both are set" do
+      it "exports ftp_proxy & FTP_PROXY when :ftp_proxy is set" do
+        config[:ftp_proxy] = "ftp://proxy"
+
+        cmd.lines.to_a[1..2].must_equal([
+          %{ftp_proxy="ftp://proxy"; export ftp_proxy\n},
+          %{FTP_PROXY="ftp://proxy"; export FTP_PROXY\n}
+        ])
+      end
+
+      it "exports all proxy variables when all are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
 
-        cmd.lines.to_a[1..4].must_equal([
+        cmd.lines.to_a[1..6].must_equal([
           %{http_proxy="http://proxy"; export http_proxy\n},
           %{HTTP_PROXY="http://proxy"; export HTTP_PROXY\n},
           %{https_proxy="https://proxy"; export https_proxy\n},
-          %{HTTPS_PROXY="https://proxy"; export HTTPS_PROXY\n}
+          %{HTTPS_PROXY="https://proxy"; export HTTPS_PROXY\n},
+          %{ftp_proxy="ftp://proxy"; export ftp_proxy\n},
+          %{FTP_PROXY="ftp://proxy"; export FTP_PROXY\n}
         ])
       end
 
@@ -306,15 +342,27 @@ describe Kitchen::Provisioner::Shell do
         ])
       end
 
-      it "exports all http proxy variables when both are set" do
+      it "exports ftp_proxy & FTP_PROXY when :ftp_proxy is set" do
+        config[:ftp_proxy] = "ftp://proxy"
+
+        cmd.lines.to_a[0..1].must_equal([
+          %{$env:ftp_proxy = "ftp://proxy"\n},
+          %{$env:FTP_PROXY = "ftp://proxy"\n}
+        ])
+      end
+
+      it "exports all proxy variables when all are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
 
-        cmd.lines.to_a[0..3].must_equal([
+        cmd.lines.to_a[0..5].must_equal([
           %{$env:http_proxy = "http://proxy"\n},
           %{$env:HTTP_PROXY = "http://proxy"\n},
           %{$env:https_proxy = "https://proxy"\n},
-          %{$env:HTTPS_PROXY = "https://proxy"\n}
+          %{$env:HTTPS_PROXY = "https://proxy"\n},
+          %{$env:ftp_proxy = "ftp://proxy"\n},
+          %{$env:FTP_PROXY = "ftp://proxy"\n}
         ])
       end
 

data/spec/kitchen/ssh_spec.rb

@@ -138,7 +138,7 @@ describe Kitchen::SSH do
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
-      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed
+      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout
     ].each do |klass|
       describe "raising #{klass}" do
 

data/spec/kitchen/transport/ssh_spec.rb

@@ -668,7 +668,8 @@ describe Kitchen::Transport::Ssh::Connection do
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
-      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Timeout::Error
+      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout,
+      Timeout::Error
     ].each do |klass|
       describe "raising #{klass}" do
 

data/spec/kitchen/transport/winrm_spec.rb

@@ -24,8 +24,29 @@ require "winrm/transport/command_executor"
 require "winrm/transport/shell_closer"
 require "winrm/transport/file_transporter"
 
+module Kitchen
+
+  module Transport
+
+    class WinRMConnectionDummy < Kitchen::Transport::Winrm::Connection
+
+      attr_reader :saved_command, :remote_path, :local_path
+
+      def upload(locals, remote)
+        @saved_command = IO.read(locals)
+        @local_path = locals
+        @remote_path = remote
+      end
+    end
+  end
+end
+
 describe Kitchen::Transport::Winrm do
 
+  before do
+    RbConfig::CONFIG.stubs(:[]).with("host_os").returns("blah")
+  end
+
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
   let(:config)        { Hash.new }
@@ -36,7 +57,11 @@ describe Kitchen::Transport::Winrm do
   end
 
   let(:transport) do
-    Kitchen::Transport::Winrm.new(config).finalize_config!(instance)
+    t = Kitchen::Transport::Winrm.new(config)
+    # :load_winrm_s! is not cross-platform safe
+    # and gets initialized too early in the pipeline
+    t.stubs(:load_winrm_s!)
+    t.finalize_config!(instance)
   end
 
   it "provisioner api_version is 1" do
@@ -81,6 +106,10 @@ describe Kitchen::Transport::Winrm do
     it "sets :max_wait_until_ready to 600 by default" do
       transport[:max_wait_until_ready].must_equal 600
     end
+
+    it "sets :winrm_transport to :plaintext" do
+      transport[:winrm_transport].must_equal :plaintext
+    end
   end
 
   describe "#connection" do
@@ -148,9 +177,10 @@ describe Kitchen::Transport::Winrm do
       it "sets :endpoint from data in config" do
         config[:hostname] = "host_from_config"
         config[:port] = "port_from_config"
+        config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:endpoint] == "http://host_from_config:port_from_config/wsman"
+          hash[:endpoint] == "https://host_from_config:port_from_config/wsman"
         end
 
         make_connection
@@ -161,9 +191,10 @@ describe Kitchen::Transport::Winrm do
         config[:hostname] = "host_from_config"
         state[:port] = "port_from_state"
         config[:port] = "port_from_config"
+        config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:endpoint] == "http://host_from_state:port_from_state/wsman"
+          hash[:endpoint] == "https://host_from_state:port_from_state/wsman"
         end
 
         make_connection
@@ -295,6 +326,55 @@ describe Kitchen::Transport::Winrm do
         make_connection
       end
 
+      it "sets :winrm_transport from config data" do
+        config[:winrm_transport] = "ssl"
+
+        klass.expects(:new).with do |hash|
+          hash[:winrm_transport] == :ssl
+        end
+
+        make_connection
+      end
+
+      describe "when sspinegotiate is set in config" do
+        before do
+          config[:winrm_transport] = "sspinegotiate"
+        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
+
+            make_connection
+          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
+        end
+      end
+
       it "returns the same connection when called again with same state" do
         first_connection  = make_connection(state)
         second_connection = make_connection(state)
@@ -358,66 +438,133 @@ describe Kitchen::Transport::Winrm do
   end
 
   describe "#load_needed_dependencies" do
+    describe "winrm-transport" do
+      before do
+        # force loading of winrm-transport to get the version constant
+        require "winrm/transport/version"
+      end
 
-    before do
-      # force loading of winrm-transport to get the version constant
-      require "winrm/transport/version"
-    end
+      it "logs a message to debug that code will be loaded" do
+        transport.stubs(:require)
+        transport
 
-    it "logs a message to debug that code will be loaded" do
-      transport
+        logged_output.string.must_match debug_line_with(
+          "Winrm Transport requested, loading WinRM::Transport gem")
+      end
 
-      logged_output.string.must_match debug_line_with(
-        "Winrm Transport requested, loading WinRM::Transport 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)
 
-    it "logs a message to debug when library is initially loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").returns(true)
-      transport.finalize_config!(instance)
+        transport.finalize_config!(instance)
 
-      logged_output.string.must_match(
-        %r{^D, .* : WinRM::Transport [^\s]+ library loaded$}
-      )
-    end
+        logged_output.string.must_match(
+          /WinRM::Transport library 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(:require).with("winrm/transport/version").returns(false)
-      transport.finalize_config!(instance)
+      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)
 
-      logged_output.string.must_match(
-        %r{^D, .* : WinRM::Transport [^\s]+ previously loaded$}
-      )
+        transport.finalize_config!(instance)
+
+        logged_output.string.must_match(
+          /WinRM::Transport previously 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")
+        begin
+          transport.finalize_config!(instance)
+        rescue # rubocop:disable Lint/HandleExceptions
+          # we are interested in the log output, not this exception
+        end
+
+        logged_output.string.must_match fatal_line_with(
+          "The `winrm-transport` 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")
+
+        err = proc {
+          transport.finalize_config!(instance)
+        }.must_raise Kitchen::UserError
+        err.message.must_match(/^Could not load or activate winrm-transport\. /)
+      end
     end
 
-    it "logs a message to fatal when libraries cannot be loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").
-        raises(LoadError, "uh oh")
-      begin
+    describe "winrm-s" do
+      before do
+        RbConfig::CONFIG.stubs(:[]).with("host_os").returns("mingw32")
+      end
+
+      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)
         transport.finalize_config!(instance)
-      rescue # rubocop:disable Lint/HandleExceptions
-        # we are interested in the log output, not this exception
+
+        logged_output.string.must_match debug_line_with(
+          "The winrm-s gem is being loaded")
       end
 
-      logged_output.string.must_match fatal_line_with(
-        "The `winrm-transport' gem is missing and must be installed")
-    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)
 
-    it "raises a UserError when libraries cannot be loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").
-        raises(LoadError, "uh oh")
+        transport.finalize_config!(instance)
+
+        logged_output.string.must_match(
+          /winrm-s 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)
 
-      err = proc {
         transport.finalize_config!(instance)
-      }.must_raise Kitchen::UserError
-      err.message.must_match(/^Could not load or activate WinRM::Transport /)
+
+        logged_output.string.must_match(
+          /winrm-s 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")
+        begin
+          transport.finalize_config!(instance)
+        rescue # rubocop:disable Lint/HandleExceptions
+          # we are interested in the log output, not this exception
+        end
+
+        logged_output.string.must_match fatal_line_with(
+          "The `winrm-s` 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")
+
+        err = proc {
+          transport.finalize_config!(instance)
+        }.must_raise Kitchen::UserError
+        err.message.must_match(/^Could not load or activate winrm-s\. /)
+      end
     end
   end
 
@@ -576,6 +723,39 @@ describe Kitchen::Transport::Winrm::Connection do
       end
     end
 
+    describe "long command" do
+      let(:command) { %{Write-Host "#{"a" * 4000}"} }
+
+      let(:connection) do
+        Kitchen::Transport::WinRMConnectionDummy.new(options)
+      end
+
+      let(:response) do
+        o = WinRM::Output.new
+        o[:exitcode] = 0
+        o[:data].concat([
+          { :stdout => "ok\r\n" },
+          { :stderr => "congrats\r\n" }
+        ])
+        o
+      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)
+      end
+
+      it "uploads the long command" do
+        with_fake_fs do
+          connection.execute(command)
+
+          connection.saved_command.must_equal command
+        end
+      end
+    end
+
     describe "for a failed command" do
 
       let(:response) do

data/spec/kitchen/verifier/base_spec.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 
 require_relative "../../spec_helper"
+require_relative "../ssh_spec"
 
 require "logger"
 require "stringio"
@@ -139,6 +140,10 @@ describe Kitchen::Verifier::Base do
     it ":http_proxys defaults to nil" do
       verifier[:https_proxy].must_equal nil
     end
+
+    it ":ftp_proxy defaults to nil" do
+      verifier[:ftp_proxy].must_equal nil
+    end
   end
 
   describe "#call" do
@@ -333,4 +338,25 @@ describe Kitchen::Verifier::Base do
       end
     end
   end
+
+  describe "#prefix_command" do
+
+    describe "with :command_prefix set" do
+
+      before { config[:command_prefix] = "my_prefix" }
+
+      it "prepends the command with the prefix" do
+        verifier.send(:prefix_command, "my_command").must_equal("my_prefix my_command")
+      end
+    end
+
+    describe "with :command_prefix unset" do
+
+      before { config[:command_prefix] = nil }
+
+      it "returns an unaltered command" do
+        verifier.send(:prefix_command, "my_command").must_equal("my_command")
+      end
+    end
+  end
 end

data/spec/kitchen/verifier/busser_spec.rb

@@ -101,7 +101,9 @@ describe Kitchen::Verifier::Busser do
 
     describe "for unix operating systems" do
 
-      before { platform.stubs(:os_type).returns("unix") }
+      before {
+        platform.stubs(:os_type).returns("unix")
+      }
 
       it ":ruby_bindir defaults the an Omnibus Chef installation" do
         verifier[:ruby_bindir].must_equal "/opt/chef/embedded/bin"
@@ -210,6 +212,26 @@ describe Kitchen::Verifier::Busser do
 
     describe "with suite test files" do
 
+      describe "common behavior" do
+
+        before do
+          platform.stubs(:shell_type).returns("fake")
+          create_test_files
+        end
+
+        it "prefixs the whole command with the command_prefix if set" do
+          config[:command_prefix] = "my_prefix"
+
+          cmd.must_match(/\Amy_prefix /)
+        end
+
+        it "does not prefix the command if command_prefix is not set" do
+          config[:command_prefix] = nil
+
+          cmd.wont_match(/\Amy_prefix /)
+        end
+      end
+
       describe "for bourne shells" do
 
         before do
@@ -237,7 +259,9 @@ describe Kitchen::Verifier::Busser do
 
         it "sets gem install arguments" do
           cmd.must_match regexify(
-            %{gem_install_args="busser --no-rdoc --no-ri"})
+            "gem_install_args=\"busser --no-rdoc --no-ri --no-format-executable" \
+            " -n /r/bin --no-user-install\""
+          )
         end
 
         it "prepends sudo for busser binstub command when :sudo is set" do
@@ -284,7 +308,9 @@ describe Kitchen::Verifier::Busser do
 
         it "sets gem install arguments" do
           cmd.must_match regexify(
-            %{$gem_install_args = "busser --no-rdoc --no-ri"})
+            "$gem_install_args = \"busser --no-rdoc --no-ri --no-format-executable" \
+            " -n \\r\\bin --no-user-install\""
+          )
         end
 
         it "sets path to busser binstub command" do
@@ -329,6 +355,26 @@ describe Kitchen::Verifier::Busser do
 
     describe "with suite test files" do
 
+      describe "common behavior" do
+
+        before do
+          platform.stubs(:shell_type).returns("fake")
+          create_test_files
+        end
+
+        it "prefixs the whole command with the command_prefix if set" do
+          config[:command_prefix] = "my_prefix"
+
+          cmd.must_match(/\Amy_prefix /)
+        end
+
+        it "does not prefix the command if command_prefix is not set" do
+          config[:command_prefix] = nil
+
+          cmd.wont_match(/\Amy_prefix /)
+        end
+      end
+
       describe "for bourne shells" do
 
         before do
@@ -407,6 +453,26 @@ describe Kitchen::Verifier::Busser do
 
     describe "with suite test files" do
 
+      describe "common behavior" do
+
+        before do
+          platform.stubs(:shell_type).returns("fake")
+          create_test_files
+        end
+
+        it "prefixs the whole command with the command_prefix if set" do
+          config[:command_prefix] = "my_prefix"
+
+          cmd.must_match(/\Amy_prefix /)
+        end
+
+        it "does not prefix the command if command_prefix is not set" do
+          config[:command_prefix] = nil
+
+          cmd.wont_match(/\Amy_prefix /)
+        end
+      end
+
       describe "for bourne shells" do
 
         before do