puppet 2.7.26 → 3.0.0.rc4

data/spec/unit/util/log/destinations_spec.rb

@@ -24,13 +24,15 @@ end
 
 
 describe Puppet::Util::Log.desttypes[:file] do
+  include PuppetSpec::Files
+
   before do
     File.stubs(:open)           # prevent actually creating the file
     @class = Puppet::Util::Log.desttypes[:file]
   end
 
-  it "should default to automatically flush log output" do
-    @class.new('/tmp/log').autoflush.should == true
+  it "should default to autoflush false" do
+    @class.new(tmpfile('log')).autoflush.should == true
   end
 
   describe "when matching" do
@@ -106,6 +108,8 @@ describe Puppet::Util::Log.desttypes[:syslog] do
 end
 
 describe Puppet::Util::Log.desttypes[:console] do
+  let (:klass) { Puppet::Util::Log.desttypes[:console] }
+
   describe "when color is available" do
     before :each do
       subject.stubs(:console_has_color?).returns(true)
@@ -132,35 +136,14 @@ describe Puppet::Util::Log.desttypes[:console] do
       vstring = subject.colorize(:reset, 'version')
       subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[mversion\e[0;32m)\e[0m"
     end
-  end
-end
 
-describe Puppet::Util::Log.desttypes[:telly_prototype_console] do
-  describe "when color is available" do
-    before :each do
-      subject.stubs(:console_has_color?).returns(true)
-    end
-
-    it "should support color output" do
-      Puppet[:color] = true
-      subject.colorize(:red, 'version').should == "\e[0;31mversion\e[0m"
-    end
-
-    it "should withhold color output when not appropriate" do
+    it "should include the log message's source/context in the output when available" do
       Puppet[:color] = false
-      subject.colorize(:red, 'version').should == "version"
-    end
-
-    it "should handle multiple overlapping colors in a stack-like way" do
-      Puppet[:color] = true
-      vstring = subject.colorize(:red, 'version')
-      subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[0;31mversion\e[0;32m)\e[0m"
-    end
+      $stdout.expects(:puts).with("Info: a hitchhiker: don't panic")
 
-    it "should handle resets in a stack-like way" do
-      Puppet[:color] = true
-      vstring = subject.colorize(:reset, 'version')
-      subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[mversion\e[0;32m)\e[0m"
+      msg = Puppet::Util::Log.new(:level => :info, :message => "don't panic", :source => "a hitchhiker")
+      dest = klass.new
+      dest.handle(msg)
     end
   end
 end

data/spec/unit/util/log_spec.rb

@@ -165,7 +165,7 @@ describe Puppet::Util::Log do
       Puppet::Util::Log.new(:level => "notice", :message => :foo).level.should == :notice
     end
 
-    it "should fail if the level is not a symbol or string", :'fails_on_ruby_1.9.2' => true do
+    it "should fail if the level is not a symbol or string" do
       lambda { Puppet::Util::Log.new(:level => 50, :message => :foo) }.should raise_error(ArgumentError)
     end
 
@@ -280,14 +280,14 @@ describe Puppet::Util::Log do
 
     describe "when setting the source as a non-RAL object" do
       it "should not try to copy over file, version, line, or tag information" do
-        source = Puppet::Module.new("foo")
+        source = mock
         source.expects(:file).never
         log = Puppet::Util::Log.new(:level => "notice", :message => :foo, :source => source)
       end
     end
   end
 
-  describe "to_yaml", :'fails_on_ruby_1.9.2' => true do
+  describe "to_yaml" do
     it "should not include the @version attribute" do
       log = Puppet::Util::Log.new(:level => "notice", :message => :foo, :version => 100)
       log.to_yaml_properties.should_not include('@version')
@@ -295,13 +295,13 @@ describe Puppet::Util::Log do
 
     it "should include attributes @level, @message, @source, @tags, and @time" do
       log = Puppet::Util::Log.new(:level => "notice", :message => :foo, :version => 100)
-      log.to_yaml_properties.should =~ %w{@level @message @source @tags @time}
+      log.to_yaml_properties.should =~ [:@level, :@message, :@source, :@tags, :@time]
     end
 
     it "should include attributes @file and @line if specified" do
       log = Puppet::Util::Log.new(:level => "notice", :message => :foo, :file => "foo", :line => 35)
-      log.to_yaml_properties.should include('@file')
-      log.to_yaml_properties.should include('@line')
+      log.to_yaml_properties.should include(:@file)
+      log.to_yaml_properties.should include(:@line)
     end
   end
 end

data/spec/unit/util/logging_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/logging'
@@ -93,27 +93,59 @@ describe Puppet::Util::Logging do
   end
 
   describe "when sending a deprecation warning" do
-    before do
-      @logger.clear_deprecation_warnings
-    end
-
-    it "should the message with warn" do
-      @logger.expects(:warning).with('foo')
+    it "should log the message with warn" do
+      @logger.expects(:warning).with do |msg|
+        msg =~ /^foo\n/
+      end
       @logger.deprecation_warning 'foo'
     end
 
-    it "should only log each unique message once" do
-      @logger.expects(:warning).with('foo').once
+    it "should only log each offending line once" do
+      @logger.expects(:warning).with do |msg|
+        msg =~ /^foo\n/
+      end .once
       5.times { @logger.deprecation_warning 'foo' }
     end
 
     it "should only log the first 100 messages" do
       (1..100).each { |i|
-          @logger.expects(:warning).with(i).once
-          @logger.deprecation_warning i
+        @logger.expects(:warning).with do |msg|
+          msg =~ /^#{i}\n/
+        end .once
+        # since the deprecation warning will only log each offending line once, we have to do some tomfoolery
+        # here in order to make it think each of these calls is coming from a unique call stack; we're basically
+        # mocking the method that it would normally use to find the call stack.
+        @logger.expects(:get_deprecation_offender).returns("deprecation log count test ##{i}")
+        @logger.deprecation_warning i
       }
       @logger.expects(:warning).with(101).never
       @logger.deprecation_warning 101
     end
   end
+
+  describe "when formatting exceptions" do
+    it "should be able to format a chain of exceptions" do
+      exc3 = Puppet::Error.new("original")
+      exc3.set_backtrace(["1.rb:4:in `a'","2.rb:2:in `b'","3.rb:1"])
+      exc2 = Puppet::Error.new("second", exc3)
+      exc2.set_backtrace(["4.rb:8:in `c'","5.rb:1:in `d'","6.rb:3"])
+      exc1 = Puppet::Error.new("third", exc2)
+      exc1.set_backtrace(["7.rb:31:in `e'","8.rb:22:in `f'","9.rb:9"])
+      # whoa ugly
+      @logger.format_exception(exc1).should =~ /third
+.*7\.rb:31
+.*8\.rb:22
+.*9\.rb:9
+Wrapped exception:
+second
+.*4\.rb:8
+.*5\.rb:1
+.*6\.rb:3
+Wrapped exception:
+original
+.*1\.rb:4
+.*2\.rb:2
+.*3\.rb:1/
+    end
+  end
 end

data/spec/unit/util/metric_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/metric'
@@ -20,8 +20,9 @@ describe Puppet::Util::Metric do
   end
 
   it "should default to the :rrdir as the basedir "do
-    Puppet.settings.expects(:value).with(:rrddir).returns "myrrd"
-    @metric.basedir.should == "myrrd"
+    rrddir = File.expand_path("myrrd")
+    Puppet[:rrddir] = rrddir
+    @metric.basedir.should == rrddir
   end
 
   it "should use any provided basedir" do

data/spec/unit/util/monkey_patches/lines_spec.rb

@@ -0,0 +1,83 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+require 'puppet/util/monkey_patches/lines'
+
+class Puppet::Util::MonkeyPatches::Lines::TestHelper < String
+  include Puppet::Util::MonkeyPatches::Lines
+end
+
+describe Puppet::Util::MonkeyPatches::Lines::TestHelper do
+  ["\n", "\n\n", "$", "$$", "@", "@@"].each do |sep|
+    context "with #{sep.inspect}" do
+      it "should delegate to each_line if given a block" do
+        subject.expects(:each_line).with(sep)
+        subject.lines(sep) do |x| nil end
+      end
+
+      it "should delegate to each_line without a block" do
+        subject.expects(:enum_for).with(:each_line, sep)
+        subject.lines(sep)
+      end
+
+      context "with one line" do
+        context "with trailing separator" do
+          subject { described_class.new("foo" + sep) }
+
+          it "should yield the string" do
+            got = []
+            subject.lines(sep) do |x| got << x end
+            got.should == ["foo#{sep}"]
+          end
+
+          it "should return the string" do
+            subject.lines(sep).to_a.should == ["foo#{sep}"]
+          end
+        end
+
+        context "without trailing separator" do
+          subject { described_class.new("foo") }
+
+          it "should yield the string" do
+            got = []
+            subject.lines(sep) do |x| got << x end
+            got.should == ["foo"]
+          end
+
+          it "should return the string" do
+            subject.lines(sep).to_a.should == ["foo"]
+          end
+        end
+      end
+
+      context "with multiple lines" do
+        context "with trailing separator" do
+          subject { described_class.new("foo#{sep}bar#{sep}baz#{sep}") }
+
+          it "should yield the strings" do
+            got = []
+            subject.lines(sep) do |x| got << x end
+            got.should == ["foo#{sep}", "bar#{sep}", "baz#{sep}"]
+          end
+
+          it "should return the strings" do
+            subject.lines(sep).to_a.should == ["foo#{sep}", "bar#{sep}", "baz#{sep}"]
+          end
+        end
+
+        context "without trailing separator" do
+          subject { described_class.new("foo#{sep}bar#{sep}baz") }
+
+          it "should yield the strings" do
+            got = []
+            subject.lines(sep) do |x| got << x end
+            got.should == ["foo#{sep}", "bar#{sep}", "baz"]
+          end
+
+          it "should return the strings" do
+            subject.lines(sep).to_a.should == ["foo#{sep}", "bar#{sep}", "baz"]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/util/monkey_patches_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/monkey_patches'
@@ -39,25 +39,60 @@ describe "yaml deserialization" do
 end
 
 # In Ruby > 1.8.7 this is a builtin, otherwise we monkey patch the method in
-describe "Array#combination" do
-  it "should fail if wrong number of arguments given" do
-    lambda { [1,2,3].combination() }.should raise_error(ArgumentError, /wrong number/)
-    lambda { [1,2,3].combination(1,2) }.should raise_error(ArgumentError, /wrong number/)
-  end
+describe Array do
+  describe "#combination" do
+    it "should fail if wrong number of arguments given" do
+      expect { [1,2,3].combination() }.to raise_error(ArgumentError, /wrong number/)
+      expect { [1,2,3].combination(1,2) }.to raise_error(ArgumentError, /wrong number/)
+    end
+
+    it "should return an empty array if combo size than array size or negative" do
+      [1,2,3].combination(4).to_a.should == []
+      [1,2,3].combination(-1).to_a.should == []
+    end
 
-  it "should return an empty array if combo size than array size or negative" do
-    [1,2,3].combination(4).to_a.should == []
-    [1,2,3].combination(-1).to_a.should == []
+    it "should return an empty array with an empty array if combo size == 0" do
+      [1,2,3].combination(0).to_a.should == [[]]
+    end
+
+    it "should all provide all combinations of size passed in" do
+      [1,2,3,4].combination(1).to_a.should == [[1], [2], [3], [4]]
+      [1,2,3,4].combination(2).to_a.should == [[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
+      [1,2,3,4].combination(3).to_a.should == [[1, 2, 3], [1, 2, 4], [1, 3, 4], [2, 3, 4]]
+    end
   end
 
-  it "should return an empty array with an empty array if combo size == 0" do
-    [1,2,3].combination(0).to_a.should == [[]]
+  describe "#count" do
+    it "should equal length" do
+      [].count.should == [].length
+      [1].count.should == [1].length
+    end
   end
 
-  it "should all provide all combinations of size passed in" do
-    [1,2,3,4].combination(1).to_a.should == [[1], [2], [3], [4]]
-    [1,2,3,4].combination(2).to_a.should == [[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
-    [1,2,3,4].combination(3).to_a.should == [[1, 2, 3], [1, 2, 4], [1, 3, 4], [2, 3, 4]]
+  describe "#drop" do
+    it "should raise if asked to drop less than zero items" do
+      expect { [].drop(-1) }.to raise_error ArgumentError
+    end
+
+    it "should return the array when drop 0" do
+      [].drop(0).should == []
+      [1].drop(0).should == [1]
+      [1,2].drop(0).should == [1,2]
+    end
+
+    it "should return an empty array when dropping more items than the array" do
+      (1..10).each do |n|
+        [].drop(n).should == []
+        [1].drop(n).should == []
+      end
+    end
+
+    it "should drop the right number of items" do
+      [1,2,3].drop(0).should == [1,2,3]
+      [1,2,3].drop(1).should == [2,3]
+      [1,2,3].drop(2).should == [3]
+      [1,2,3].drop(3).should == []
+    end
   end
 end
 
@@ -91,13 +126,40 @@ describe IO do
       File.open(file, 'rb') {|f| f.read.should == content }
     end
 
-    it "should write using an offset" do
-      offset = 1
-      IO.binwrite(file, content, offset).should == content.length - offset
-      File.open(file, 'rb') {|f| f.read.should == content[offset..-1] }
+    (0..10).each do |offset|
+      it "should write correctly using an offset of #{offset}" do
+        IO.binwrite(file, content, offset).should == content.length
+        File.open(file, 'rb') {|f| f.read.should == ("\x00" * offset) + content }
+      end
     end
 
-    it "should raise an error if the file doesn't exist" do
+    context "truncation" do
+      let :input do "welcome to paradise, population ... YOU!" end
+      before :each do IO.binwrite(file, input) end
+
+      it "should truncate if no offset is given" do
+        IO.binwrite(file, "boo").should == 3
+        File.read(file).should == "boo"
+      end
+
+      (0..10).each do |offset|
+        it "should not truncate if an offset of #{offset} is given" do
+          expect = input.dup
+          expect[offset, 3] = "BAM"
+
+          IO.binwrite(file, "BAM", offset).should == 3
+          File.read(file).should == expect
+        end
+      end
+
+      it "should pad with NULL bytes if writing past EOF without truncate" do
+        expect = input + ("\x00" * 4) + "BAM"
+        IO.binwrite(file, "BAM", input.length + 4).should == 3
+        File.read(file).should == expect
+      end
+    end
+
+    it "should raise an error if the directory containing the file doesn't exist" do
       expect { IO.binwrite('/path/does/not/exist', 'foo') }.to raise_error(Errno::ENOENT)
     end
   end
@@ -180,14 +242,15 @@ describe Range do
   end
 end
 
-describe OpenSSL::SSL::SSLContext do
-  it 'disables SSLv2 via the SSLContext#options bitmask' do
-    (subject.options & OpenSSL::SSL::OP_NO_SSLv2).should == OpenSSL::SSL::OP_NO_SSLv2
+
+describe Object, "#instance_variables" do
+  it "should work with no instance variables" do
+    Object.new.instance_variables.should == []
   end
-  it 'has no ciphers with version SSLv2 enabled' do
-    ciphers = subject.ciphers.select do |name, version, bits, alg_bits|
-      /SSLv2/.match(version)
-    end
-    ciphers.should be_empty
+
+  it "should return symbols, not strings" do
+    o = Object.new
+    ["@foo", "@bar", "@baz"].map {|x| o.instance_variable_set(x, x) }
+    o.instance_variables.should =~ [:@foo, :@bar, :@baz]
   end
 end

data/spec/unit/util/nagios_maker_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/nagios_maker'

data/spec/unit/util/network_device/cisco/device_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/network_device/cisco/device'
@@ -145,7 +145,7 @@ eos
     "ATM 0/1.1" => "ATM0/1.1",
     "VLAN99" => "VLAN99"
   }.each do |input,expected|
-    it "should canonicalize #{input} to #{expected}", :'fails_on_ruby_1.9.2' => true do
+    it "should canonicalize #{input} to #{expected}" do
       @cisco.canonalize_ifname(input).should == expected
     end
   end
@@ -232,7 +232,7 @@ eos
       @cisco.parse_interface("FastEthernet0/1").should == { :ensure => :absent, :duplex => :auto, :speed => :auto }
     end
 
-    it "should be able to parse the sh vlan brief command output", :'fails_on_ruby_1.9.2' => true do
+    it "should be able to parse the sh vlan brief command output" do
       @cisco.stubs(:support_vlan_brief?).returns(true)
       @transport.stubs(:command).with("sh vlan brief").returns(<<eos)
 Switch#sh vlan brief