puppet 2.7.26 → 3.0.0.rc4

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

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

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

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

data/spec/unit/util/network_device/config_spec.rb

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

data/spec/unit/util/network_device/ipcalc_spec.rb

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

data/spec/unit/util/network_device/transport/base_spec.rb

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

data/spec/unit/util/network_device/transport/ssh_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/network_device/transport/ssh'
 
-describe Puppet::Util::NetworkDevice::Transport::Ssh, :if => Puppet.features.ssh?, :'fails_on_ruby_1.9.2' => true do
+describe Puppet::Util::NetworkDevice::Transport::Ssh, :if => Puppet.features.ssh? do
 
   before(:each) do
     @transport = Puppet::Util::NetworkDevice::Transport::Ssh.new()

data/spec/unit/util/network_device/transport/telnet_spec.rb

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

data/spec/unit/util/network_device_spec.rb

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

data/spec/unit/util/package_spec.rb

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

data/spec/unit/util/pidlock_spec.rb

@@ -0,0 +1,179 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+require 'puppet/util/pidlock'
+
+describe Puppet::Util::Pidlock do
+  require 'puppet_spec/files'
+  include PuppetSpec::Files
+
+  before(:each) do
+    @lockfile = tmpfile("lock")
+    @lock = Puppet::Util::Pidlock.new(@lockfile)
+  end
+
+  describe "#lock" do
+    it "should not be locked at start" do
+      @lock.should_not be_locked
+    end
+
+    it "should not be mine at start" do
+      @lock.should_not be_mine
+    end
+
+    it "should become locked" do
+      @lock.lock
+      @lock.should be_locked
+    end
+
+    it "should become mine" do
+      @lock.lock
+      @lock.should be_mine
+    end
+
+    it "should be possible to lock multiple times" do
+      @lock.lock
+      lambda { @lock.lock }.should_not raise_error
+    end
+
+    it "should return true when locking" do
+      @lock.lock.should be_true
+    end
+
+    it "should return true if locked by me" do
+      @lock.lock
+      @lock.lock.should be_true
+    end
+
+
+    it "should create a lock file" do
+      @lock.lock
+      File.should be_exists(@lockfile)
+    end
+  end
+
+  describe "#unlock" do
+    it "should not be locked anymore" do
+      @lock.lock
+      @lock.unlock
+      @lock.should_not be_locked
+    end
+
+    it "should return false if not locked" do
+      @lock.unlock.should be_false
+    end
+
+    it "should return true if properly unlocked" do
+      @lock.lock
+      @lock.unlock.should be_true
+    end
+
+    it "should get rid of the lock file" do
+      @lock.lock
+      @lock.unlock
+      File.should_not be_exists(@lockfile)
+    end
+  end
+
+  describe "#locked?" do
+    it "should return true if locked" do
+      @lock.lock
+      @lock.should be_locked
+    end
+  end
+
+  describe "with a stale lock" do
+    before(:each) do
+      # fake our pid to be 1234
+      Process.stubs(:pid).returns(1234)
+      # lock the file
+      @lock.lock
+      # fake our pid to be a different pid, to simulate someone else
+      #  holding the lock
+      Process.stubs(:pid).returns(6789)
+
+      Process.stubs(:kill).with(0, 6789)
+      Process.stubs(:kill).with(0, 1234).raises(Errno::ESRCH)
+    end
+
+    it "should not be locked" do
+      @lock.should_not be_locked
+    end
+
+    describe "#lock" do
+      it "should clear stale locks" do
+        @lock.locked?
+        File.should_not be_exists(@lockfile)
+      end
+
+      it "should replace with new locks" do
+        @lock.lock
+        File.should be_exists(@lockfile)
+        @lock.lock_pid.should == 6789
+        @lock.should be_mine
+        @lock.should be_locked
+      end
+    end
+
+    describe "#unlock" do
+      it "should not be allowed" do
+        @lock.unlock.should be_false
+      end
+
+      it "should not remove the lock file" do
+        @lock.unlock
+        File.should be_exists(@lockfile)
+      end
+    end
+  end
+
+  describe "with another process lock" do
+    before(:each) do
+      # fake our pid to be 1234
+      Process.stubs(:pid).returns(1234)
+      # lock the file
+      @lock.lock
+      # fake our pid to be a different pid, to simulate someone else
+      #  holding the lock
+      Process.stubs(:pid).returns(6789)
+
+      Process.stubs(:kill).with(0, 6789)
+      Process.stubs(:kill).with(0, 1234)
+    end
+
+    it "should be locked" do
+      @lock.should be_locked
+    end
+
+    it "should not be mine" do
+      @lock.should_not be_mine
+    end
+
+    describe "#lock" do
+      it "should not be possible" do
+        @lock.lock.should be_false
+      end
+
+      it "should not overwrite the lock" do
+        @lock.lock
+        @lock.should_not be_mine
+      end
+    end
+
+    describe "#unlock" do
+      it "should not be possible" do
+        @lock.unlock.should be_false
+      end
+
+      it "should not remove the lock file" do
+        @lock.unlock
+        File.should be_exists(@lockfile)
+      end
+
+      it "should still not be our lock" do
+        @lock.unlock
+        @lock.should_not be_mine
+      end
+    end
+  end
+end

data/spec/unit/util/posix_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/posix'
@@ -51,7 +51,7 @@ describe Puppet::Util::POSIX do
 
     describe "and the id is an integer" do
       it "should log an error and return nil if the specified id is greater than the maximum allowed ID" do
-        Puppet.settings.expects(:value).with(:maximum_uid).returns 100
+        Puppet[:maximum_uid] = 100
         Puppet.expects(:err)
 
         @posix.get_posix_field("asdf", "bar", 200).should be_nil

data/spec/unit/util/pson_spec.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
+# Encoding: UTF-8
 require 'spec_helper'
 
 require 'puppet/util/pson'
@@ -7,9 +8,11 @@ class PsonUtil
   include Puppet::Util::Pson
 end
 
-describe Puppet::Util::Pson, :'fails_on_ruby_1.9.2' => true do
+describe Puppet::Util::Pson do
   it "should fail if no data is provided" do
-    lambda { PsonUtil.new.pson_create("type" => "foo") }.should raise_error(ArgumentError)
+    expect {
+      PsonUtil.new.pson_create("type" => "foo")
+    }.to raise_error(ArgumentError, /No data provided in pson data/)
   end
 
   it "should call 'from_pson' with the provided data" do
@@ -18,21 +21,32 @@ describe Puppet::Util::Pson, :'fails_on_ruby_1.9.2' => true do
     pson.pson_create("type" => "foo", "data" => "mydata")
   end
 
-
-  { 
+  {
     'foo' => '"foo"',
     1 => '1',
     "\x80" => "\"\x80\"",
     [] => '[]'
-  }.each { |str,pson|
+  }.each do |str, expect|
     it "should be able to encode #{str.inspect}" do
-      str.to_pson.should == pson
+      got = str.to_pson
+      if got.respond_to? :force_encoding
+        got.force_encoding('binary').should == expect.force_encoding('binary')
+      else
+        got.should == expect
+      end
     end
-  }
+  end
 
   it "should be able to handle arbitrary binary data" do
     bin_string = (1..20000).collect { |i| ((17*i+13*i*i) % 255).chr }.join
-    PSON.parse(%Q{{ "type": "foo", "data": #{bin_string.to_pson} }})["data"].should == bin_string
+    parsed = PSON.parse(%Q{{ "type": "foo", "data": #{bin_string.to_pson} }})["data"]
+
+    if parsed.respond_to? :force_encoding
+      parsed.force_encoding('binary')
+      bin_string.force_encoding('binary')
+    end
+
+    parsed.should == bin_string
   end
 
   it "should be able to handle UTF8 that isn't a real unicode character" do

data/spec/unit/util/queue/stomp_spec.rb

@@ -1,15 +1,14 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/util/queue'
 
-describe Puppet::Util::Queue, :if => Puppet.features.stomp?, :'fails_on_ruby_1.9.2' => true do
+describe Puppet::Util::Queue, :if => Puppet.features.stomp? do
   it 'should load :stomp client appropriately' do
-    Puppet.settings.stubs(:value).returns 'faux_queue_source'
     Puppet::Util::Queue.queue_type_to_class(:stomp).name.should == 'Puppet::Util::Queue::Stomp'
   end
 end
 
-describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on_ruby_1.9.2' => true do
+describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp? do
   before do
     # So we make sure we never create a real client instance.
     # Otherwise we'll try to connect, and that's bad.
@@ -27,28 +26,26 @@ describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on
     end
 
     it "should provide helpful failures when the queue source is not a valid source" do
-      # Stub rather than expect, so we can include the source in the error
-      Puppet.settings.stubs(:value).with(:queue_source).returns "-----"
+      Puppet[:queue_source] = "-----"
 
-      lambda { Puppet::Util::Queue::Stomp.new }.should raise_error(ArgumentError)
+      expect { Puppet::Util::Queue::Stomp.new }.to raise_error(ArgumentError, /not a Stomp URL/)
     end
 
     it "should fail unless the queue source is a stomp URL" do
-      # Stub rather than expect, so we can include the source in the error
-      Puppet.settings.stubs(:value).with(:queue_source).returns "http://foo/bar"
+      Puppet[:queue_source] = "http://foo/bar"
 
-      lambda { Puppet::Util::Queue::Stomp.new }.should raise_error(ArgumentError)
+      expect { Puppet::Util::Queue::Stomp.new }.to raise_error(ArgumentError, /not a Stomp URL/)
     end
 
     it "should fail somewhat helpfully if the Stomp client cannot be created" do
       Stomp::Client.expects(:new).raises RuntimeError
-      lambda { Puppet::Util::Queue::Stomp.new }.should raise_error(ArgumentError)
+      expect { Puppet::Util::Queue::Stomp.new }.to raise_error(ArgumentError)
     end
 
     list = %w{user password host port}
     {"user" => "myuser", "password" => "mypass", "host" => "foohost", "port" => 42}.each do |name, value|
       it "should use the #{name} from the queue source as the queueing #{name}" do
-        Puppet.settings.expects(:value).with(:queue_source).returns "stomp://myuser:mypass@foohost:42/"
+        Puppet[:queue_source] = "stomp://myuser:mypass@foohost:42/"
 
         Stomp::Client.expects(:new).with { |*args| args[list.index(name)] == value }
         Puppet::Util::Queue::Stomp.new
@@ -56,7 +53,7 @@ describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on
     end
 
     it "should create a reliable client instance" do
-      Puppet.settings.expects(:value).with(:queue_source).returns "stomp://myuser@foohost:42/"
+      Puppet[:queue_source] = "stomp://myuser@foohost:42/"
 
       Stomp::Client.expects(:new).with { |*args| args[4] == true }
       Puppet::Util::Queue::Stomp.new

data/spec/unit/util/queue_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/util/queue'
 require 'spec/mocks'
@@ -87,7 +87,7 @@ describe Puppet::Util::Queue do
 
   context 'when determining client type' do
     it 'returns client class based on the :queue_type setting' do
-      Puppet.settings.expects(:value).with(:queue_type).returns(:myqueue)
+      Puppet[:queue_type] = :myqueue
       Puppet::Util::Queue.expects(:queue_type_to_class).with(:myqueue).returns "eh"
       @class.client_class.should == "eh"
     end

data/spec/unit/util/rdoc/parser_spec.rb

@@ -1,13 +1,15 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-require 'puppet/resource/type_collection'
-require 'puppet/util/rdoc/parser'
-require 'puppet/util/rdoc/code_objects'
-require 'rdoc/options'
-require 'rdoc/rdoc'
+describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
+  before :all do
+    require 'puppet/resource/type_collection'
+    require 'puppet/util/rdoc/parser'
+    require 'puppet/util/rdoc/code_objects'
+    require 'rdoc/options'
+    require 'rdoc/rdoc'
+  end
 
-describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
   include PuppetSpec::Files
 
   before :each do
@@ -324,7 +326,7 @@ describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
     end
 
     it "should scan for resources if needed" do
-      Puppet.settings.stubs(:[]).with(:document_all).returns(true)
+      Puppet[:document_all] = true
       @parser.expects(:scan_for_resource).with(@rdoc_node, @code)
       @parser.document_node("mynode", @node, @class)
     end
@@ -368,7 +370,7 @@ describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
     end
 
     it "should scan for resources if needed" do
-      Puppet.settings.stubs(:[]).with(:document_all).returns(true)
+      Puppet[:document_all] = true
       @parser.expects(:scan_for_resource).with(@rdoc_class, @code)
       @parser.document_class("mynode", @class, @module)
     end

data/spec/unit/util/rdoc_spec.rb

@@ -1,12 +1,19 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/rdoc'
 require 'rdoc/rdoc'
 
 describe Puppet::Util::RDoc do
+  it "should fail with a clear error without RDoc 1.*" do
+    Puppet.features.stubs(:rdoc1?).returns(false)
 
-  describe "when generating RDoc HTML documentation", :'fails_on_ruby_1.9.2' => true do
+    expect {
+      Puppet::Util::RDoc.rdoc("output", [])
+    }.to raise_error(/the version of RDoc .* is not supported/)
+  end
+
+  describe "when generating RDoc HTML documentation", :if => Puppet.features.rdoc1? do
     before :each do
       @rdoc = stub_everything 'rdoc'
       RDoc::RDoc.stubs(:new).returns(@rdoc)
@@ -14,7 +21,6 @@ describe Puppet::Util::RDoc do
 
     it "should tell the parser to ignore import" do
       Puppet.expects(:[]=).with(:ignoreimport, true)
-
       Puppet::Util::RDoc.rdoc("output", [])
     end