test-kitchen 1.14.1 → 1.14.2

data/spec/kitchen/provisioner_spec.rb

@@ -25,14 +25,11 @@ require "kitchen/provisioner"
 require "kitchen/provisioner/base"
 
 module Kitchen
-
   module Provisioner
-
     class Coolbeans < Kitchen::Provisioner::Base
     end
 
     class ItDepends < Kitchen::Provisioner::Base
-
       attr_reader :verify_call_count
 
       def initialize(config = {})
@@ -46,7 +43,6 @@ module Kitchen
     end
 
     class UnstableDepends < Kitchen::Provisioner::Base
-
       def verify_dependencies
         raise UserError, "Oh noes, you don't have software!"
       end
@@ -55,9 +51,7 @@ module Kitchen
 end
 
 describe Kitchen::Provisioner do
-
   describe ".for_plugin" do
-
     before do
       Kitchen::Provisioner.stubs(:require).returns(true)
     end
@@ -69,7 +63,7 @@ describe Kitchen::Provisioner do
     end
 
     it "returns a provisioner initialized with its config" do
-      provisioner = Kitchen::Provisioner.for_plugin("coolbeans", :foo => "bar")
+      provisioner = Kitchen::Provisioner.for_plugin("coolbeans", foo: "bar")
 
       provisioner[:foo].must_equal "bar"
     end
@@ -92,16 +86,16 @@ describe Kitchen::Provisioner do
     it "raises ClientError if the provisioner could not be required" do
       Kitchen::Provisioner.stubs(:require).raises(LoadError)
 
-      proc { Kitchen::Provisioner.for_plugin("coolbeans", {}) }.
-        must_raise Kitchen::ClientError
+      proc { Kitchen::Provisioner.for_plugin("coolbeans", {}) }
+        .must_raise Kitchen::ClientError
     end
 
     it "raises ClientError if the provisioner's class constant was not found" do
       # pretend require worked
       Kitchen::Provisioner.stubs(:require).returns(true)
 
-      proc { Kitchen::Provisioner.for_plugin("nope", {}) }.
-        must_raise Kitchen::ClientError
+      proc { Kitchen::Provisioner.for_plugin("nope", {}) }
+        .must_raise Kitchen::ClientError
     end
   end
 end

data/spec/kitchen/shell_out_spec.rb

@@ -23,9 +23,7 @@ require "kitchen/shell_out"
 require "kitchen/util"
 
 module Kitchen
-
   class Shelly
-
     include Kitchen::ShellOut
 
     attr_reader :logs
@@ -42,22 +40,20 @@ module Kitchen
 end
 
 describe Kitchen::ShellOut do
-
   let(:command) do
     stub(
-      :run_command => true,
-      :error! => true,
-      :stdout => "",
-      :execution_time => 123
+      run_command: true,
+      error!: true,
+      stdout: "",
+      execution_time: 123
     )
   end
 
   let(:subject) { Kitchen::Shelly.new }
 
   describe "#run_command" do
-
     let(:opts) do
-      { :live_stream => "alogger", :timeout => 60000 }
+      { live_stream: "alogger", timeout: 60_000 }
     end
 
     before do
@@ -89,11 +85,11 @@ describe Kitchen::ShellOut do
     end
 
     it "raises a ShellCommandFailed if the command does not cleanly exit" do
-      command.stubs(:error!).
-        raises(Mixlib::ShellOut::ShellCommandFailed, "boom bad")
+      command.stubs(:error!)
+             .raises(Mixlib::ShellOut::ShellCommandFailed, "boom bad")
 
-      err = proc { subject.run_command("boom") }.
-        must_raise Kitchen::ShellOut::ShellCommandFailed
+      err = proc { subject.run_command("boom") }
+            .must_raise Kitchen::ShellOut::ShellCommandFailed
       err.message.must_equal "boom bad"
     end
 
@@ -109,25 +105,25 @@ describe Kitchen::ShellOut do
       Mixlib::ShellOut.unstub(:new)
       Mixlib::ShellOut.expects(:new).with("sudo -E yo", opts).returns(command)
 
-      subject.run_command("yo", :use_sudo => true)
+      subject.run_command("yo", use_sudo: true)
     end
 
     it "prepends with custom :sudo_command if :use_sudo is truthy" do
       Mixlib::ShellOut.unstub(:new)
       Mixlib::ShellOut.expects(:new).with("wat yo", opts).returns(command)
 
-      subject.run_command("yo", :use_sudo => true, :sudo_command => "wat")
+      subject.run_command("yo", use_sudo: true, sudo_command: "wat")
     end
 
     it "logs a debug BEGIN message" do
       subject.run_command("echo whoopa\ndoopa\ndo")
 
-      subject.logs.first.
-        must_equal "[local command] BEGIN (echo whoopa\ndoopa\ndo)"
+      subject.logs.first
+             .must_equal "[local command] BEGIN (echo whoopa\ndoopa\ndo)"
     end
 
     it "logs a debug BEGIN message with custom log subject" do
-      subject.run_command("tenac", :log_subject => "thed")
+      subject.run_command("tenac", log_subject: "thed")
 
       subject.logs.first.must_equal "[thed command] BEGIN (tenac)"
     end
@@ -142,7 +138,7 @@ describe Kitchen::ShellOut do
     end
 
     it "logs a debug END message with custom log subject" do
-      subject.run_command("tenac", :log_subject => "thed")
+      subject.run_command("tenac", log_subject: "thed")
 
       subject.logs.last.must_equal "[thed command] END (2m3.00s)"
     end

data/spec/kitchen/ssh_spec.rb

@@ -87,13 +87,9 @@ end
 # 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"]
 
@@ -116,7 +112,6 @@ module Net
 end
 
 describe Kitchen::SSH do
-
   include Net::SSH::Test
 
   let(:logged_output) { StringIO.new }
@@ -137,14 +132,12 @@ describe Kitchen::SSH do
   end
 
   describe "establishing a connection" do
-
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
       Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout
     ].each do |klass|
       describe "raising #{klass}" do
-
         before do
           Net::SSH.stubs(:start).raises(klass)
           opts[:ssh_retries] = 3
@@ -161,9 +154,9 @@ describe Kitchen::SSH do
           rescue # rubocop:disable Lint/HandleExceptions
           end
 
-          logged_output.string.lines.count { |l|
+          logged_output.string.lines.count do |l|
             l =~ debug_line("[SSH] opening connection to me@foo:22<{:ssh_retries=>3}>")
-          }.must_equal opts[:ssh_retries]
+          end.must_equal opts[:ssh_retries]
         end
 
         it "sleeps for 1 second between retries" do
@@ -182,9 +175,9 @@ describe Kitchen::SSH do
           rescue # rubocop:disable Lint/HandleExceptions
           end
 
-          logged_output.string.lines.count { |l|
+          logged_output.string.lines.count do |l|
             l =~ info_line_with("[SSH] connection failed, retrying ")
-          }.must_equal 2
+          end.must_equal 2
         end
 
         it "logs the last retry failures on warn" do
@@ -193,18 +186,16 @@ describe Kitchen::SSH do
           rescue # rubocop:disable Lint/HandleExceptions
           end
 
-          logged_output.string.lines.count { |l|
+          logged_output.string.lines.count do |l|
             l =~ warn_line_with("[SSH] connection failed, terminating ")
-          }.must_equal 1
+          end.must_equal 1
         end
       end
     end
   end
 
   describe "#exec" do
-
     describe "for a successful command" do
-
       before do
         story do |script|
           channel = script.opens_channel
@@ -248,7 +239,6 @@ describe Kitchen::SSH do
     end
 
     describe "for a failed command" do
-
       before do
         story do |script|
           channel = script.opens_channel
@@ -310,7 +300,6 @@ describe Kitchen::SSH do
   end
 
   describe "#upload!" do
-
     let(:content) { "a" * 1234 }
 
     let(:src) do
@@ -358,7 +347,6 @@ describe Kitchen::SSH do
   end
 
   describe "#upload_path!" do
-
     before do
       @dir = Dir.mktmpdir("local")
 
@@ -438,7 +426,6 @@ describe Kitchen::SSH do
   end
 
   describe "#shutdown" do
-
     before do
       story do |script|
         channel = script.opens_channel
@@ -477,7 +464,6 @@ describe Kitchen::SSH do
   end
 
   describe "block form" do
-
     before do
       story do |script|
         channel = script.opens_channel
@@ -500,7 +486,6 @@ describe Kitchen::SSH do
   end
 
   describe "#login_command" do
-
     let(:login_command) { ssh.login_command }
     let(:args)          { login_command.arguments.join(" ") }
 
@@ -566,7 +551,7 @@ describe Kitchen::SSH do
     end
 
     it "sets SSH keys options if given" do
-      opts[:keys] = %w[one two]
+      opts[:keys] = %w{one two}
 
       args.must_match regexify(" -i one ")
       args.must_match regexify(" -i two ")
@@ -584,8 +569,7 @@ describe Kitchen::SSH do
   end
 
   describe "#test_ssh" do
-
-    let(:tcp_socket) { stub(:select_for_read? => true, :close => true) }
+    let(:tcp_socket) { stub(select_for_read?: true, close: true) }
 
     before { ssh.stubs(:sleep) }
 
@@ -609,7 +593,6 @@ describe Kitchen::SSH do
       Errno::ENETUNREACH, IOError
     ].each do |klass|
       describe "when #{klass} is raised" do
-
         before { TCPSocket.stubs(:new).raises(klass) }
 
         it "returns false" do
@@ -628,7 +611,6 @@ describe Kitchen::SSH do
       Errno::EPERM, Errno::ETIMEDOUT
     ].each do |klass|
       describe "when #{klass} is raised" do
-
         it "returns false when #{klass} is raised" do
           TCPSocket.stubs(:new).raises(klass)
 
@@ -639,22 +621,21 @@ describe Kitchen::SSH do
   end
 
   describe "#wait" do
-
     let(:not_ready) do
-      stub(:select_for_read? => false, :idle! => true, :close => true)
+      stub(select_for_read?: false, idle!: true, close: true)
     end
 
     let(:ready) do
-      stub(:select_for_read? => true, :close => true)
+      stub(select_for_read?: true, close: true)
     end
 
     it "logs to info for each retry" do
       TCPSocket.stubs(:new).returns(not_ready, not_ready, ready)
       ssh.wait
 
-      logged_output.string.lines.count { |l|
+      logged_output.string.lines.count do |l|
         l =~ info_line_with("Waiting for foo:22...")
-      }.must_equal 2
+      end.must_equal 2
     end
   end
 
@@ -676,18 +657,18 @@ describe Kitchen::SSH do
   end
 
   def debug_line(msg)
-    %r{^D, .* : #{Regexp.escape(msg)}$}
+    /^D, .* : #{Regexp.escape(msg)}$/
   end
 
   def debug_line_with(msg)
-    %r{^D, .* : #{Regexp.escape(msg)}}
+    /^D, .* : #{Regexp.escape(msg)}/
   end
 
   def info_line_with(msg)
-    %r{^I, .* : #{Regexp.escape(msg)}}
+    /^I, .* : #{Regexp.escape(msg)}/
   end
 
   def warn_line_with(msg)
-    %r{^W, .* : #{Regexp.escape(msg)}}
+    /^W, .* : #{Regexp.escape(msg)}/
   end
 end

data/spec/kitchen/state_file_spec.rb

@@ -27,7 +27,6 @@ class YamledState
 end
 
 describe Kitchen::StateFile do
-
   let(:state_file)  { Kitchen::StateFile.new("/tmp", "oftheunion") }
   let(:file_name)   { "/tmp/.kitchen/oftheunion.yml" }
 
@@ -42,23 +41,22 @@ describe Kitchen::StateFile do
   end
 
   describe "#read" do
-
     it "returns an empty hash if the file does not exist" do
-      state_file.read.must_equal(Hash.new)
+      state_file.read.must_equal({})
     end
 
     it "returns and empty hash if the file is zero length" do
       stub_state_file!("")
 
-      state_file.read.must_equal(Hash.new)
+      state_file.read.must_equal({})
     end
 
     it "returns a Hash with symbolized keys from the state file" do
       stub_state_file!
 
       state_file.read.must_equal(
-        :cloud_id => 42,
-        :flavor => "extra_crispy"
+        cloud_id: 42,
+        flavor: "extra_crispy"
       )
     end
 
@@ -70,7 +68,7 @@ describe Kitchen::StateFile do
 
       state_file.read.class.wont_equal YamledState
       state_file.read.class.must_equal Hash
-      state_file.read.must_equal(:yoinks => "zoinks")
+      state_file.read.must_equal(yoinks: "zoinks")
     end
 
     it "raises a StateFileLoadError if the state file cannot be parsed" do
@@ -78,11 +76,9 @@ describe Kitchen::StateFile do
 
       proc { state_file.read }.must_raise Kitchen::StateFileLoadError
     end
-
   end
 
   describe "#write" do
-
     it "creates the directory path to the state file" do
       File.directory?("/tmp/.kitchen").must_equal false
       state_file.write({})
@@ -90,14 +86,13 @@ describe Kitchen::StateFile do
     end
 
     it "writes a state file with stringified keys" do
-      state_file.write(:thekey => "thyself")
+      state_file.write(thekey: "thyself")
 
       IO.read(file_name).split("\n").must_include "thekey: thyself"
     end
   end
 
   describe "#destroy" do
-
     it "executes if no file exists" do
       File.exist?(file_name).must_equal false
       state_file.destroy

data/spec/kitchen/suite_spec.rb

@@ -22,12 +22,11 @@ require "kitchen/errors"
 require "kitchen/suite"
 
 describe Kitchen::Suite do
-
   let(:opts) do
     {
-      :name => "suitezy",
-      :includes => %w[testbuntu testcent],
-      :excludes => %w[prodbuntu]
+      name: "suitezy",
+      includes: %w{testbuntu testcent},
+      excludes: %w{prodbuntu},
     }
   end
 
@@ -43,7 +42,7 @@ describe Kitchen::Suite do
   end
 
   it "returns the includes" do
-    suite.includes.must_equal %w[testbuntu testcent]
+    suite.includes.must_equal %w{testbuntu testcent}
   end
 
   it "returns an empty Array when includes not given" do
@@ -52,7 +51,7 @@ describe Kitchen::Suite do
   end
 
   it "returns the excludes" do
-    suite.excludes.must_equal %w[prodbuntu]
+    suite.excludes.must_equal %w{prodbuntu}
   end
 
   it "returns an empty Array when excludes not given" do