test-kitchen 1.19.2 → 1.20.0

data/spec/kitchen/state_file_spec.rb

@@ -66,9 +66,7 @@ describe Kitchen::StateFile do
         yoinks: zoinks
       YAML
 
-      state_file.read.class.wont_equal YamledState
-      state_file.read.class.must_equal Hash
-      state_file.read.must_equal(yoinks: "zoinks")
+      proc { state_file.read }.must_raise Kitchen::StateFileLoadError
     end
 
     it "raises a StateFileLoadError if the state file cannot be parsed" do

data/spec/kitchen/transport/base_spec.rb

@@ -97,6 +97,11 @@ describe Kitchen::Transport::Base::Connection do
       .must_raise Kitchen::ClientError
   end
 
+  it "has an #download method which raises a ClientError" do
+    proc { connection.download(["remote"], "local") }
+      .must_raise Kitchen::ClientError
+  end
+
   it "has a #wait_until_ready method that does nothing" do
     connection.wait_until_ready.must_be_nil
   end
@@ -120,4 +125,16 @@ describe Kitchen::Transport::Base::Connection do
       connection.execute_with_retry("Hi", [123], 3, 1).must_equal "Hello"
     end
   end
+
+  describe "#retry?" do
+    it "raises an exception when multiple retryable exit codes are passed as a String" do
+      proc { connection.retry?(2, 2, "35 1", 35) }
+        .must_raise("undefined method `flatten' for \"35 1\":String")
+    end
+
+    it "returns true when the retryable exit codes are formatted in a nested array" do
+      connection.retry?(1, 2, [[35, 1]], 35).must_equal true
+    end
+  end
+
 end

data/spec/kitchen/transport/ssh_spec.rb

@@ -120,13 +120,41 @@ describe Kitchen::Transport::Ssh do
     it "sets :max_ssh_sessions to 9 by default" do
       transport[:max_ssh_sessions].must_equal 9
     end
+
+    it "sets :ssh_http_proxy to nil by default" do
+      transport[:ssh_http_proxy].must_be_nil
+    end
+
+    it "sets :ssh_http_proxy_port to nil by default" do
+      transport[:ssh_http_proxy_port].must_be_nil
+    end
+
+    it "sets :ssh_http_proxy_user to nil by default" do
+      transport[:ssh_http_proxy_user].must_be_nil
+    end
+
+    it "sets :ssh_http_proxy_password to nil by default" do
+      transport[:ssh_http_proxy_password].must_be_nil
+    end
   end
 
   describe "#connection" do
     let(:klass) { Kitchen::Transport::Ssh::Connection }
+    let(:options_http_proxy) { Hash.new }
+    let(:proxy_conn) do
+      state[:ssh_http_proxy]        = "ssh_http_proxy_from_state"
+      state[:ssh_http_proxy_port]   = "ssh_http_proxy_port_from_state"
+      options_http_proxy[:user]     = state[:ssh_http_proxy_user]
+      options_http_proxy[:password] = state[:ssh_http_proxy_password]
+      Net::SSH::Proxy::HTTP.new(state[:ssh_http_proxy], state[:ssh_http_proxy_port], options_http_proxy)
+    end
 
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def self.common_connection_specs
+      before do
+        Net::SSH::Proxy::HTTP.stubs(:new).returns(proxy_conn)
+      end
+
       it "returns a Kitchen::Transport::Ssh::Connection object" do
         transport.connection(state).must_be_kind_of klass
       end
@@ -417,6 +445,16 @@ describe Kitchen::Transport::Ssh do
         make_connection
       end
 
+      it "sets :proxy to proxy if :ssh_http_proxy is set in state" do
+        config[:ssh_http_proxy] = true
+
+        klass.expects(:new).with do |hash|
+          hash[:proxy] == proxy_conn
+        end
+
+        make_connection
+      end
+
       it "sets :keys to an array if :ssh_key is set in config" do
         config[:kitchen_root] = "/r"
         config[:ssh_key] = "ssh_key_from_config"
@@ -1092,6 +1130,79 @@ describe Kitchen::Transport::Ssh::Connection do
     end
   end
 
+  describe "#download" do
+    let(:conn) { mock("session") }
+    let(:scp) { mock("scp") }
+
+    before do
+      Net::SSH.stubs(:start).returns(conn)
+      conn.stubs(:scp).returns(scp)
+      @local_parent = Dir.mktmpdir("dir")
+      @local = File.join(@local_parent, "local")
+    end
+
+    after do
+      FileUtils.remove_entry_secure(@local_parent)
+    end
+
+    describe "for a file" do
+      it "downloads a file from a remote over scp" do
+        FileUtils.expects(:mkdir_p).with(@local_parent)
+        scp.expects(:download!).with("/remote", @local)
+
+        connection.download("/remote", @local)
+      end
+    end
+
+    describe "for a list of files" do
+      it "downloads the files from a remote over scp" do
+        FileUtils.expects(:mkdir_p).with(@local_parent)
+        scp.expects(:download!).with("/remote-1", @local)
+        scp.expects(:download!).with("/remote-2", @local)
+
+        connection.download(["/remote-1", "/remote-2"], @local)
+      end
+    end
+
+    describe "for a directory" do
+      it "downloads the directory from a remote over scp" do
+        FileUtils.expects(:mkdir_p).with(@local_parent)
+        scp.expects(:download!).with("/remote-dir", @local).raises(Net::SCP::Error)
+        scp.expects(:download!).with("/remote-dir", @local, recursive: true)
+
+        connection.download("/remote-dir", @local)
+      end
+    end
+
+    describe "for a file that does not exist" do
+      it "logs a warning" do
+        FileUtils.expects(:mkdir_p).with(@local_parent)
+        scp.expects(:download!).with("/remote", @local).raises(Net::SCP::Error)
+        scp.expects(:download!).with("/remote", @local, recursive: true)
+          .raises(Net::SCP::Error)
+
+        connection.download("/remote", @local)
+
+        logged_output.string.lines.count do |l|
+          l =~ warn_line_with(
+            "SCP download failed for file or directory '/remote', perhaps it does not exist?"
+          )
+        end.must_equal 1
+      end
+    end
+
+    describe "for a failed download" do
+      it "raises SshFailed when an SSH exception is raised" do
+        conn.stubs(:scp).raises(Net::SSH::Exception)
+
+        e = proc do
+          connection.download("nope", "fail")
+        end.must_raise Kitchen::Transport::SshFailed
+        e.message.must_match regexify("SCP download failed")
+      end
+    end
+  end
+
   describe "#wait_until_ready" do
     before do
       options[:max_wait_until_ready] = 300

data/test-kitchen.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "net-scp",         "~> 1.1"
   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.19", "< 0.19.2"
   gem.add_dependency "mixlib-install",  "~> 3.6"
   gem.add_dependency "winrm", "~> 2.0"
@@ -42,7 +41,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "aruba",     "~> 0.11"
   gem.add_development_dependency "fakefs",    "~> 0.4"
-  gem.add_development_dependency "minitest",  "~> 5.3"
+  gem.add_development_dependency "minitest",  "~> 5.3", "< 5.11"
   gem.add_development_dependency "mocha",     "~> 1.1"
   gem.add_development_dependency "cucumber",  "~> 2.1"
   gem.add_development_dependency "countloc",  "~> 0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.20.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -78,20 +78,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +245,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,6 +255,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement