test-kitchen 1.4.2 → 1.5.0

data/spec/kitchen/configurable_spec.rb

@@ -727,6 +727,19 @@ describe Kitchen::Configurable do
 
     let(:cmd) { subject.send(:wrap_shell_code, "mkdir foo") }
 
+    before do
+      @original_env = ENV.to_hash
+      ENV.replace("http_proxy"  => nil, "HTTP_PROXY"  => nil,
+                  "https_proxy" => nil, "HTTPS_PROXY" => nil,
+                  "ftp_proxy"   => nil, "FTP_PROXY"   => nil,
+                  "no_proxy"    => nil, "NO_PROXY"    => nil)
+    end
+
+    after do
+      ENV.clear
+      ENV.replace(@original_env)
+    end
+
     describe "for bourne shells" do
 
       before { platform.stubs(:shell_type).returns("bourne") }
@@ -764,16 +777,121 @@ describe Kitchen::Configurable do
         CODE
       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.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          ftp_proxy="ftp://proxy"; export ftp_proxy
+          FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports all http proxy variables when all are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          http_proxy="http://proxy"; export http_proxy
+          HTTP_PROXY="http://proxy"; export HTTP_PROXY
+          https_proxy="https://proxy"; export https_proxy
+          HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
+          ftp_proxy="ftp://proxy"; export ftp_proxy
+          FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports http_proxy & HTTP_PROXY from workstation when :http_proxy isn't set" do
+        ENV["http_proxy"] = "http://proxy"
+        ENV["HTTP_PROXY"] = "http://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          http_proxy="http://proxy"; export http_proxy
+          HTTP_PROXY="http://proxy"; export HTTP_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports https_proxy & HTTPS_PROXY from workstation when :https_proxy isn't set" do
+        ENV["https_proxy"] = "https://proxy"
+        ENV["HTTPS_PROXY"] = "https://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          https_proxy="https://proxy"; export https_proxy
+          HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports ftp_proxy & FTP_PROXY from workstation when :ftp_proxy isn't set" do
+        ENV["ftp_proxy"] = "ftp://proxy"
+        ENV["FTP_PROXY"] = "ftp://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          ftp_proxy="ftp://proxy"; export ftp_proxy
+          FTP_PROXY="ftp://proxy"; export FTP_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports no_proxy & NO_PROXY from workstation when http_proxy is set from workstation" do
+        ENV["http_proxy"] = "http://proxy"
+        ENV["HTTP_PROXY"] = "http://proxy"
+        ENV["no_proxy"]   = "http://no"
+        ENV["NO_PROXY"]   = "http://no"
 
         cmd.must_equal(outdent!(<<-CODE.chomp))
           sh -c '
           http_proxy="http://proxy"; export http_proxy
           HTTP_PROXY="http://proxy"; export HTTP_PROXY
+          no_proxy="http://no"; export no_proxy
+          NO_PROXY="http://no"; export NO_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports no_proxy & NO_PROXY from workstation when https_proxy is set from workstation" do
+        ENV["https_proxy"] = "https://proxy"
+        ENV["HTTPS_PROXY"] = "https://proxy"
+        ENV["no_proxy"]   = "http://no"
+        ENV["NO_PROXY"]   = "http://no"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
           https_proxy="https://proxy"; export https_proxy
           HTTPS_PROXY="https://proxy"; export HTTPS_PROXY
+          no_proxy="http://no"; export no_proxy
+          NO_PROXY="http://no"; export NO_PROXY
+          mkdir foo
+          '
+        CODE
+      end
+
+      it "exports no_proxy & NO_PROXY from workstation when ftp_proxy is set from workstation" do
+        ENV["ftp_proxy"]  = "ftp://proxy"
+        ENV["FTP_PROXY"]  = "ftp://proxy"
+        ENV["no_proxy"]   = "http://no"
+        ENV["NO_PROXY"]   = "http://no"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          sh -c '
+          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
           mkdir foo
           '
         CODE
@@ -808,15 +926,106 @@ describe Kitchen::Configurable do
         CODE
       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.must_equal(outdent!(<<-CODE.chomp))
+          $env:ftp_proxy = "ftp://proxy"
+          $env:FTP_PROXY = "ftp://proxy"
+          mkdir foo
+        CODE
+      end
+
+      it "exports all http proxy variables when all are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          $env:http_proxy = "http://proxy"
+          $env:HTTP_PROXY = "http://proxy"
+          $env:https_proxy = "https://proxy"
+          $env:HTTPS_PROXY = "https://proxy"
+          $env:ftp_proxy = "ftp://proxy"
+          $env:FTP_PROXY = "ftp://proxy"
+          mkdir foo
+        CODE
+      end
+
+      it "exports http_proxy & HTTP_PROXY from workstation when :http_proxy isn't set" do
+        ENV["http_proxy"] = "http://proxy"
+        ENV["HTTP_PROXY"] = "http://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          $env:http_proxy = "http://proxy"
+          $env:HTTP_PROXY = "http://proxy"
+          mkdir foo
+        CODE
+      end
+
+      it "exports https_proxy & HTTPS_PROXY from workstation when :https_proxy isn't set" do
+        ENV["https_proxy"] = "https://proxy"
+        ENV["HTTPS_PROXY"] = "https://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          $env:https_proxy = "https://proxy"
+          $env:HTTPS_PROXY = "https://proxy"
+          mkdir foo
+        CODE
+      end
+
+      it "exports ftp_proxy & FTP_PROXY from workstation when :ftp_proxy isn't set" do
+        ENV["ftp_proxy"] = "ftp://proxy"
+        ENV["FTP_PROXY"] = "ftp://proxy"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          $env:ftp_proxy = "ftp://proxy"
+          $env:FTP_PROXY = "ftp://proxy"
+          mkdir foo
+        CODE
+      end
+
+      it "exports no_proxy & NO_PROXY from workstation when http_proxy is set from workstation" do
+        ENV["http_proxy"] = "http://proxy"
+        ENV["HTTP_PROXY"] = "http://proxy"
+        ENV["no_proxy"]   = "http://no"
+        ENV["NO_PROXY"]   = "http://no"
 
         cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:http_proxy = "http://proxy"
           $env:HTTP_PROXY = "http://proxy"
+          $env:no_proxy = "http://no"
+          $env:NO_PROXY = "http://no"
+          mkdir foo
+        CODE
+      end
+
+      it "exports no_proxy & NO_PROXY from workstation when https_proxy is set from workstation" do
+        ENV["https_proxy"] = "https://proxy"
+        ENV["HTTPS_PROXY"] = "https://proxy"
+        ENV["no_proxy"]   = "http://no"
+        ENV["NO_PROXY"]   = "http://no"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
           $env:https_proxy = "https://proxy"
           $env:HTTPS_PROXY = "https://proxy"
+          $env:no_proxy = "http://no"
+          $env:NO_PROXY = "http://no"
+          mkdir foo
+        CODE
+      end
+
+      it "exports no_proxy & NO_PROXY from workstation when ftp_proxy is set from workstation" do
+        ENV["ftp_proxy"] = "ftp://proxy"
+        ENV["FTP_PROXY"] = "ftp://proxy"
+        ENV["no_proxy"]   = "http://no"
+        ENV["NO_PROXY"]   = "http://no"
+
+        cmd.must_equal(outdent!(<<-CODE.chomp))
+          $env:ftp_proxy = "ftp://proxy"
+          $env:FTP_PROXY = "ftp://proxy"
+          $env:no_proxy = "http://no"
+          $env:NO_PROXY = "http://no"
           mkdir foo
         CODE
       end

data/spec/kitchen/driver/ssh_base_spec.rb

@@ -288,11 +288,18 @@ describe Kitchen::Driver::SSHBase do
       provisioner.stubs(:[]).with(:root_path).returns("/rooty")
       FakeFS.activate!
       FileUtils.mkdir_p("/tmp")
+      @original_env = ENV.to_hash
+      ENV.replace("http_proxy"  => nil, "HTTP_PROXY"  => nil,
+                  "https_proxy" => nil, "HTTPS_PROXY" => nil,
+                  "ftp_proxy"   => nil, "FTP_PROXY"   => nil,
+                  "no_proxy"    => nil, "NO_PROXY"    => nil)
     end
 
     after do
       FakeFS.deactivate!
       FakeFS::FileSystem.clear
+      ENV.clear
+      ENV.replace(@original_env)
     end
 
     constructs_an_ssh_connection
@@ -333,6 +340,33 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
+    it "invokes the #install_command with ENV[\"http_proxy\"] set" do
+      ENV["http_proxy"] = "http://proxy"
+      transport.stubs(:connection).yields(connection)
+      if running_tests_on_windows?
+        connection.expects(:execute).
+          with("env http_proxy=http://proxy HTTP_PROXY=http://proxy install")
+      else
+        connection.expects(:execute).with("env http_proxy=http://proxy install")
+      end
+      cmd
+    end
+
+    it "invokes the #install_command with ENV[\"http_proxy\"] and ENV[\"no_proxy\"] set" do
+      ENV["http_proxy"] = "http://proxy"
+      ENV["no_proxy"]   = "http://no"
+      transport.stubs(:connection).yields(connection)
+      if running_tests_on_windows?
+        connection.expects(:execute).
+          with("env http_proxy=http://proxy HTTP_PROXY=http://proxy " \
+            "no_proxy=http://no NO_PROXY=http://no install")
+      else
+        connection.expects(:execute).with("env http_proxy=http://proxy " \
+          "no_proxy=http://no install")
+      end
+      cmd
+    end
+
     it "invokes the #install_command with :https_proxy set in config" do
       config[:https_proxy] = "https://proxy"
       transport.stubs(:connection).yields(connection)
@@ -341,12 +375,75 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
-    it "invokes the #install_command with :http_proxy & :https_proxy set" do
+    it "invokes the #install_command with ENV[\"https_proxy\"] set" do
+      ENV["https_proxy"] = "https://proxy"
+      transport.stubs(:connection).yields(connection)
+      if running_tests_on_windows?
+        connection.expects(:execute).
+          with("env https_proxy=https://proxy HTTPS_PROXY=https://proxy install")
+      else
+        connection.expects(:execute).with("env https_proxy=https://proxy install")
+      end
+      cmd
+    end
+
+    it "invokes the #install_command with ENV[\"https_proxy\"] and ENV[\"no_proxy\"] set" do
+      ENV["https_proxy"] = "https://proxy"
+      ENV["no_proxy"]    = "https://no"
+      transport.stubs(:connection).yields(connection)
+      if running_tests_on_windows?
+        connection.expects(:execute).
+          with("env https_proxy=https://proxy HTTPS_PROXY=https://proxy " \
+          "no_proxy=https://no NO_PROXY=https://no install")
+      else
+        connection.expects(:execute).with("env https_proxy=https://proxy " \
+          "no_proxy=https://no install")
+      end
+      cmd
+    end
+
+    it "invokes the #install_command with :ftp_proxy set in config" do
+      config[:ftp_proxy] = "ftp://proxy"
+      transport.stubs(:connection).yields(connection)
+      connection.expects(:execute).with("env ftp_proxy=ftp://proxy install")
+
+      cmd
+    end
+
+    it "invokes the #install_command with ENV[\"ftp_proxy\"] set" do
+      ENV["ftp_proxy"] = "ftp://proxy"
+      transport.stubs(:connection).yields(connection)
+      if running_tests_on_windows?
+        connection.expects(:execute).
+          with("env ftp_proxy=ftp://proxy FTP_PROXY=ftp://proxy install")
+      else
+        connection.expects(:execute).with("env ftp_proxy=ftp://proxy install")
+      end
+      cmd
+    end
+
+    it "invokes the #install_command with ENV[\"ftp_proxy\"] and ENV[\"no_proxy\"] set" do
+      ENV["ftp_proxy"]  = "ftp://proxy"
+      ENV["no_proxy"]   = "http://no"
+      transport.stubs(:connection).yields(connection)
+      if running_tests_on_windows?
+        connection.expects(:execute).
+          with("env ftp_proxy=ftp://proxy FTP_PROXY=http://proxy " \
+            "no_proxy=http://no NO_PROXY=http://no install")
+      else
+        connection.expects(:execute).with("env ftp_proxy=ftp://proxy " \
+          "no_proxy=http://no install")
+      end
+      cmd
+    end
+
+    it "invokes the #install_command with :http_proxy & :https_proxy & :ftp_proxy set" do
       config[:http_proxy] = "http://proxy"
       config[:https_proxy] = "https://proxy"
+      config[:ftp_proxy] = "ftp://proxy"
       transport.stubs(:connection).yields(connection)
       connection.expects(:execute).with(
-        "env http_proxy=http://proxy https_proxy=https://proxy install")
+        "env http_proxy=http://proxy https_proxy=https://proxy ftp_proxy=ftp://proxy install")
 
       cmd
     end
@@ -428,12 +525,21 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
-    it "invokes the Verifier#install_command with :http_proxy & :https_proxy set" do
+    it "invokes the Verifier#install_command with :ftp_proxy set in config" do
+      config[:ftp_proxy] = "ftp://proxy"
+      transport.stubs(:connection).yields(connection)
+      connection.expects(:execute).with("env ftp_proxy=ftp://proxy install")
+
+      cmd
+    end
+
+    it "invokes the Verifier#install_command with :http_proxy & :https_proxy & :ftp_proxy set" do
       config[:http_proxy] = "http://proxy"
       config[:https_proxy] = "https://proxy"
+      config[:ftp_proxy] = "ftp://proxy"
       transport.stubs(:connection).yields(connection)
       connection.expects(:execute).with(
-        "env http_proxy=http://proxy https_proxy=https://proxy install")
+        "env http_proxy=http://proxy https_proxy=https://proxy ftp_proxy=ftp://proxy install")
 
       cmd
     end
@@ -505,11 +611,19 @@ describe Kitchen::Driver::SSHBase do
         cmd
       end
 
-      it "invokes Verifier##{phase}_command with :http_proxy & :https_proxy set" do
+      it "invokes Verifier##{phase}_command with :ftp_proxy set in config" do
+        config[:ftp_proxy] = "ftp://proxy"
+        connection.expects(:execute).with("env ftp_proxy=ftp://proxy #{phase}")
+
+        cmd
+      end
+
+      it "invokes Verifier##{phase}_command with :http_proxy & :https_proxy & :ftp_proxy set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
         connection.expects(:execute).with(
-          "env http_proxy=http://proxy https_proxy=https://proxy #{phase}")
+          "env http_proxy=http://proxy https_proxy=https://proxy ftp_proxy=ftp://proxy #{phase}")
 
         cmd
       end
@@ -919,12 +1033,21 @@ describe Kitchen::Driver::SSHBase do
         cmd
       end
 
-      it "invokes the #install_command with :http_proxy & :https_proxy set" do
+      it "invokes the #install_command with :ftp_proxy set in config" do
+        config[:ftp_proxy] = "ftp://proxy"
+        Kitchen::SSH.stubs(:new).returns(connection)
+        connection.expects(:exec).with("env ftp_proxy=ftp://proxy huh")
+
+        cmd
+      end
+
+      it "invokes the #install_command with :http_proxy & :https_proxy & :ftp_proxy set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        config[:ftp_proxy] = "ftp://proxy"
         Kitchen::SSH.stubs(:new).returns(connection)
         connection.expects(:exec).with(
-          "env http_proxy=http://proxy https_proxy=https://proxy huh")
+          "env http_proxy=http://proxy https_proxy=https://proxy ftp_proxy=ftp://proxy huh")
 
         cmd
       end

data/spec/kitchen/lazy_hash_spec.rb

@@ -87,4 +87,31 @@ describe Kitchen::LazyHash do
       converted.fetch(:genre).must_equal "heavy metal"
     end
   end
+
+  describe "select" do
+    it "calls Procs when appropriate" do
+      Kitchen::LazyHash.new(hash_obj, context).select { |_, _| true }.
+        must_equal :shed_color => "blue", :barn => "locked", :genre => "heavy metal"
+    end
+  end
+
+  describe "enumerable" do
+    it "is an Enumerable" do
+      assert Kitchen::LazyHash.new(hash_obj, context).is_a? Enumerable
+    end
+
+    it "returns an Enumerator from each() if no block given" do
+      e = Kitchen::LazyHash.new(hash_obj, context).each
+      e.is_a? Enumerator
+      e.next.must_equal [:shed_color, "blue"]
+      e.next.must_equal [:barn, "locked"]
+      e.next.must_equal [:genre, "heavy metal"]
+    end
+
+    it "yields each item to the block if a block is given to each()" do
+      items = []
+      Kitchen::LazyHash.new(hash_obj, context).each { |i| items << i }
+      items.must_equal [[:shed_color, "blue"], [:barn, "locked"], [:genre, "heavy metal"]]
+    end
+  end
 end

data/spec/kitchen/logger_spec.rb

@@ -282,6 +282,16 @@ describe Kitchen::Logger do
         )
       end
 
+      it "logger that receives mixed first chunk will flush next message with newline" do
+        logger << "partially\no"
+        logger << "kay\n"
+
+        stdout.string.must_equal(
+          colorize("       partially", opts[:color]) + "\n" +
+          colorize("       okay", opts[:color]) + "\n"
+        )
+      end
+
       it "logger chomps carriage return characters" do
         logger << [
           "-----> banner\r",

data/spec/kitchen/provisioner/base_spec.rb

@@ -131,6 +131,10 @@ describe Kitchen::Provisioner::Base do
     it ":http_proxys defaults to nil" do
       provisioner[:https_proxy].must_equal nil
     end
+
+    it ":ftp_proxy defaults to nil" do
+      provisioner[:ftp_proxy].must_equal nil
+    end
   end
 
   describe "#call" do
@@ -325,4 +329,25 @@ describe Kitchen::Provisioner::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
+        provisioner.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
+        provisioner.send(:prefix_command, "my_command").must_equal("my_command")
+      end
+    end
+  end
 end