puppet 2.6.18 → 2.7.1

data/spec/unit/type/augeas_spec.rb

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 augeas = Puppet::Type.type(:augeas)
 
 describe augeas do
-  describe "when augeas is present", :if => Puppet.features.augeas? do
+  describe "when augeas is present", :if => Puppet.features.augeas?, :'fails_on_ruby_1.9.2' => true do
     it "should have a default provider inheriting from Puppet::Provider" do
       augeas.defaultprovider.ancestors.should be_include(Puppet::Provider)
     end

data/spec/unit/type/component_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 component = Puppet::Type.type(:component)
 

data/spec/unit/type/computer_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 computer = Puppet::Type.type(:computer)
 

data/spec/unit/type/cron_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:cron) do
   before do
@@ -478,4 +477,14 @@ describe Puppet::Type.type(:cron) do
     end
 
   end
+
+  it "should require a command when adding an entry" do
+    entry = @class.new(:name => "test_entry", :ensure => :present)
+    expect { entry.value(:command) }.should raise_error(/No command/)
+  end
+
+  it "should not require a command when removing an entry" do
+    entry = @class.new(:name => "test_entry", :ensure => :absent)
+    entry.value(:command).should == nil
+  end
 end

data/spec/unit/type/exec_spec.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:exec) do
   def exec_tester(command, exitstatus = 0, rest = {})
@@ -284,36 +284,6 @@ describe Puppet::Type.type(:exec) do
       @exec = Puppet::Type.type(:exec).new(:name => '/bin/true')
     end
 
-    describe "when setting env" do
-      it "should issue a deprecation warning" do
-        expect { @exec[:env] = 'foo=bar' }.should_not raise_error
-        @logs.first.message.should =~ /deprecate.*environment/
-      end
-
-      it "should update the value of env" do
-        data = ['foo=bar']
-        @exec[:env] = data
-        @exec[:env].should == data
-      end
-
-      it "should forward to environment" do
-        data = ['foo=bar']
-        @exec[:env] = data
-        @exec[:environment].should == data
-      end
-
-      it "should not override environment if both are set" do
-        pending "can't fix: too disruptive for 2.6, removed in 2.7"
-        # ...so this test is here to validate that we know about the problem.
-        # This ensures correct order of evaluation to trigger the bug; don't
-        # count on this happening in the constructor. --daniel 2011-03-01
-        @exec[:environment] = 'environment=true'
-        @exec[:env]         = 'env=true'
-
-        @exec[:environment].should == "environment=true"
-      end
-    end
-
     describe "when setting environment" do
       { "single values"   => "foo=bar",
         "multiple values" => ["foo=bar", "baz=quux"],

data/spec/unit/type/file/checksum_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 checksum = Puppet::Type.type(:file).attrclass(:checksum)
 describe checksum do

data/spec/unit/type/file/content_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 content = Puppet::Type.type(:file).attrclass(:content)
 describe content do

data/spec/unit/type/file/ctime.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:file).attrclass(:ctime) do
   require 'puppet_spec/files'

data/spec/unit/type/file/ensure_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 property = Puppet::Type.type(:file).attrclass(:ensure)
 

data/spec/unit/type/file/group_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 property = Puppet::Type.type(:file).attrclass(:group)
 

data/spec/unit/type/file/mtime.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:file).attrclass(:mtime) do
   require 'puppet_spec/files'

data/spec/unit/type/file/owner_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 property = Puppet::Type.type(:file).attrclass(:owner)
 

data/spec/unit/type/file/selinux_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 
 [:seluser, :selrole, :seltype, :selrange].each do |param|

data/spec/unit/type/file/source_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 source = Puppet::Type.type(:file).attrclass(:source)
 describe Puppet::Type.type(:file).attrclass(:source) do
@@ -54,22 +53,22 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
     it "should collect its metadata using the Metadata class if it is not already set" do
       @source = source.new(:resource => @resource, :value => "/foo/bar")
-      Puppet::FileServing::Metadata.expects(:find).with("/foo/bar").returns @metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/foo/bar").returns @metadata
       @source.metadata
     end
 
     it "should use the metadata from the first found source" do
       metadata = stub 'metadata', :source= => nil
       @source = source.new(:resource => @resource, :value => ["/foo/bar", "/fee/booz"])
-      Puppet::FileServing::Metadata.expects(:find).with("/foo/bar").returns nil
-      Puppet::FileServing::Metadata.expects(:find).with("/fee/booz").returns metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/foo/bar").returns nil
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/fee/booz").returns metadata
       @source.metadata.should equal(metadata)
     end
 
     it "should store the found source as the metadata's source" do
       metadata = mock 'metadata'
       @source = source.new(:resource => @resource, :value => "/foo/bar")
-      Puppet::FileServing::Metadata.expects(:find).with("/foo/bar").returns metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/foo/bar").returns metadata
 
       metadata.expects(:source=).with("/foo/bar")
       @source.metadata
@@ -77,7 +76,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
     it "should fail intelligently if an exception is encountered while querying for metadata" do
       @source = source.new(:resource => @resource, :value => "/foo/bar")
-      Puppet::FileServing::Metadata.expects(:find).with("/foo/bar").raises RuntimeError
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/foo/bar").raises RuntimeError
 
       @source.expects(:fail).raises ArgumentError
       lambda { @source.metadata }.should raise_error(ArgumentError)
@@ -85,7 +84,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
     it "should fail if no specified sources can be found" do
       @source = source.new(:resource => @resource, :value => "/foo/bar")
-      Puppet::FileServing::Metadata.expects(:find).with("/foo/bar").returns nil
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/foo/bar").returns nil
 
       @source.expects(:fail).raises RuntimeError
 
@@ -96,7 +95,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
       expirer = stub 'expired', :dependent_data_expired? => true
 
       metadata = stub 'metadata', :source= => nil
-      Puppet::FileServing::Metadata.expects(:find).with("/fee/booz").returns metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with("/fee/booz").returns metadata
 
       @source = source.new(:resource => @resource, :value => ["/fee/booz"])
       @source.metadata = "foo"

data/spec/unit/type/file/type.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:file).attrclass(:type) do
   require 'puppet_spec/files'

data/spec/unit/type/file_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:file) do
   before do
@@ -263,12 +262,12 @@ describe Puppet::Type.type(:file) do
         file[:path].should == "X:/foo/bar/baz"
       end
 
-      it "should leave a drive letter with a slash alone" do
+      it "should leave a drive letter with a slash alone", :'fails_on_ruby_1.9.2' => true do
         file = Puppet::Type::File.new(:path => "X:/")
         file[:path].should == "X:/"
       end
 
-      it "should add a slash to a drive letter" do
+      it "should add a slash to a drive letter", :'fails_on_ruby_1.9.2' => true do
         file = Puppet::Type::File.new(:path => "X:")
         file[:path].should == "X:/"
       end
@@ -287,7 +286,7 @@ describe Puppet::Type.type(:file) do
   end
 
   describe "when using UNC filenames" do
-    describe "on Microsoft Windows systems", :if => Puppet.features.microsoft_windows? do
+    describe "on Microsoft Windows systems", :if => Puppet.features.microsoft_windows?, :'fails_on_ruby_1.9.2' => true do
       before do
         Puppet.features.stubs(:posix?).returns(false)
         Puppet.features.stubs(:microsoft_windows?).returns(true)
@@ -379,8 +378,6 @@ describe Puppet::Type.type(:file) do
   end
 
   describe "when managing links" do
-    require 'puppettest/support/assertions'
-    include PuppetTest
     require 'tempfile'
 
     if @real_posix
@@ -394,13 +391,7 @@ describe Puppet::Type.type(:file) do
           File.open(@file, "w", 0644) { |f| f.puts "yayness"; f.flush }
           File.symlink(@file, @link)
 
-
-                @resource = Puppet::Type.type(:file).new(
-
-            :path => @link,
-
-            :mode => "755"
-          )
+          @resource = Puppet::Type.type(:file).new(:path => @link, :mode => "755")
           @catalog.add_resource @resource
         end
 
@@ -525,47 +516,47 @@ describe Puppet::Type.type(:file) do
 
   describe "when executing a recursive search" do
     it "should use Metadata to do its recursion" do
-      Puppet::FileServing::Metadata.expects(:search)
+      Puppet::FileServing::Metadata.indirection.expects(:search)
       @file.perform_recursion(@file[:path])
     end
 
     it "should use the provided path as the key to the search" do
-      Puppet::FileServing::Metadata.expects(:search).with { |key, options| key == "/foo" }
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |key, options| key == "/foo" }
       @file.perform_recursion("/foo")
     end
 
     it "should return the results of the metadata search" do
-      Puppet::FileServing::Metadata.expects(:search).returns "foobar"
+      Puppet::FileServing::Metadata.indirection.expects(:search).returns "foobar"
       @file.perform_recursion(@file[:path]).should == "foobar"
     end
 
     it "should pass its recursion value to the search" do
       @file[:recurse] = true
-      Puppet::FileServing::Metadata.expects(:search).with { |key, options| options[:recurse] == true }
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |key, options| options[:recurse] == true }
       @file.perform_recursion(@file[:path])
     end
 
     it "should pass true if recursion is remote" do
       @file[:recurse] = :remote
-      Puppet::FileServing::Metadata.expects(:search).with { |key, options| options[:recurse] == true }
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |key, options| options[:recurse] == true }
       @file.perform_recursion(@file[:path])
     end
 
     it "should pass its recursion limit value to the search" do
       @file[:recurselimit] = 10
-      Puppet::FileServing::Metadata.expects(:search).with { |key, options| options[:recurselimit] == 10 }
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |key, options| options[:recurselimit] == 10 }
       @file.perform_recursion(@file[:path])
     end
 
     it "should configure the search to ignore or manage links" do
       @file[:links] = :manage
-      Puppet::FileServing::Metadata.expects(:search).with { |key, options| options[:links] == :manage }
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |key, options| options[:links] == :manage }
       @file.perform_recursion(@file[:path])
     end
 
     it "should pass its 'ignore' setting to the search if it has one" do
       @file[:ignore] = %w{.svn CVS}
-      Puppet::FileServing::Metadata.expects(:search).with { |key, options| options[:ignore] == %w{.svn CVS} }
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |key, options| options[:ignore] == %w{.svn CVS} }
       @file.perform_recursion(@file[:path])
     end
   end
@@ -612,7 +603,7 @@ describe Puppet::Type.type(:file) do
 
     it "should set checksum_type to none if this file checksum is none" do
       @file[:checksum] = :none
-      Puppet::FileServing::Metadata.expects(:search).with { |path,params| params[:checksum_type] == :none }.returns [@metadata]
+      Puppet::FileServing::Metadata.indirection.expects(:search).with { |path,params| params[:checksum_type] == :none }.returns [@metadata]
       @file.expects(:newchild).with("my/file").returns "fiebar"
       @file.recurse_local
     end
@@ -1190,10 +1181,4 @@ describe Puppet::Type.type(:file) do
       @file[:checksum].should be :md5lite
     end
   end
-
-  describe ".instances" do
-    it 'should return an empty array' do
-      Puppet::Type::File.instances.should == []
-    end
-  end
 end

data/spec/unit/type/filebucket_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:filebucket) do
   describe "when validating attributes" do

data/spec/unit/type/group_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:group) do
   before do
@@ -42,11 +41,11 @@ describe Puppet::Type.type(:group) do
     end
   end
 
-  it "should have a boolean method for determining if duplicates are allowed" do
+  it "should have a boolean method for determining if duplicates are allowed", :'fails_on_ruby_1.9.2' => true do
     @class.new(:name => "foo").methods.should be_include("allowdupe?")
   end
 
-  it "should have a boolean method for determining if system groups are allowed" do
+  it "should have a boolean method for determining if system groups are allowed", :'fails_on_ruby_1.9.2' => true do
     @class.new(:name => "foo").methods.should be_include("system?")
   end
 

data/spec/unit/type/host_spec.rb

@@ -0,0 +1,129 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+host = Puppet::Type.type(:host)
+
+describe host do
+  before do
+    @class = host
+    @catalog = Puppet::Resource::Catalog.new
+    @provider = stub 'provider'
+    @resource = stub 'resource', :resource => nil, :provider => @provider
+  end
+
+  it "should have :name be its namevar" do
+    @class.key_attributes.should == [:name]
+  end
+
+  describe "when validating attributes" do
+    [:name, :provider ].each do |param|
+      it "should have a #{param} parameter" do
+        @class.attrtype(param).should == :param
+      end
+    end
+
+    [:ip, :target, :host_aliases, :comment, :ensure].each do |property|
+      it "should have a #{property} property" do
+        @class.attrtype(property).should == :property
+      end
+    end
+
+    it "should have a list host_aliases" do
+      @class.attrclass(:host_aliases).ancestors.should be_include(Puppet::Property::OrderedList)
+    end
+
+  end
+
+  describe "when validating values" do
+    it "should support present as a value for ensure" do
+      proc { @class.new(:name => "foo", :ensure => :present) }.should_not raise_error
+    end
+
+    it "should support absent as a value for ensure" do
+      proc { @class.new(:name => "foo", :ensure => :absent) }.should_not raise_error
+    end
+
+    it "should accept IPv4 addresses" do
+      proc { @class.new(:name => "foo", :ip => '10.96.0.1') }.should_not raise_error
+    end
+
+    it "should accept long IPv6 addresses" do
+      # Taken from wikipedia article about ipv6
+      proc { @class.new(:name => "foo", :ip => '2001:0db8:85a3:08d3:1319:8a2e:0370:7344') }.should_not raise_error
+    end
+
+    it "should accept one host_alias" do
+      proc { @class.new(:name => "foo", :host_aliases => 'alias1') }.should_not raise_error
+    end
+
+    it "should accept multiple host_aliases" do
+      proc { @class.new(:name => "foo", :host_aliases => [ 'alias1', 'alias2' ]) }.should_not raise_error
+    end
+
+    it "should accept shortened IPv6 addresses" do
+      proc { @class.new(:name => "foo", :ip => '2001:db8:0:8d3:0:8a2e:70:7344') }.should_not raise_error
+      proc { @class.new(:name => "foo", :ip => '::ffff:192.0.2.128') }.should_not raise_error
+      proc { @class.new(:name => "foo", :ip => '::1') }.should_not raise_error
+    end
+
+    it "should not accept malformed IPv4 addresses like 192.168.0.300" do
+      proc { @class.new(:name => "foo", :ip => '192.168.0.300') }.should raise_error
+    end
+
+    it "should not accept malformed IP addresses like 2001:0dg8:85a3:08d3:1319:8a2e:0370:7344" do
+      proc { @class.new(:name => "foo", :ip => '2001:0dg8:85a3:08d3:1319:8a2e:0370:7344') }.should raise_error
+    end
+
+    it "should not accept spaces in resourcename" do
+      proc { @class.new(:name => "foo bar") }.should raise_error
+    end
+
+    it "should not accept host_aliases with spaces" do
+      proc { @class.new(:name => "foo", :host_aliases => [ 'well_formed', 'not wellformed' ]) }.should raise_error
+    end
+
+    it "should not accept empty host_aliases" do
+      proc { @class.new(:name => "foo", :host_aliases => ['alias1','']) }.should raise_error
+    end
+  end
+
+  describe "when syncing" do
+
+    it "should send the first value to the provider for ip property" do
+      @ip = @class.attrclass(:ip).new(:resource => @resource, :should => %w{192.168.0.1 192.168.0.2})
+      @provider.expects(:ip=).with '192.168.0.1'
+      @ip.sync
+    end
+
+    it "should send the first value to the provider for comment property" do
+      @comment = @class.attrclass(:comment).new(:resource => @resource, :should => %w{Bazinga Notme})
+      @provider.expects(:comment=).with 'Bazinga'
+      @comment.sync
+    end
+
+    it "should send the joined array to the provider for host_alias" do
+      @host_aliases = @class.attrclass(:host_aliases).new(:resource => @resource, :should => %w{foo bar})
+      @provider.expects(:host_aliases=).with 'foo bar'
+      @host_aliases.sync
+    end
+
+    it "should also use the specified delimiter for joining" do
+      @host_aliases = @class.attrclass(:host_aliases).new(:resource => @resource, :should => %w{foo bar})
+      @host_aliases.stubs(:delimiter).returns "\t"
+      @provider.expects(:host_aliases=).with "foo\tbar"
+      @host_aliases.sync
+    end
+
+    it "should care about the order of host_aliases" do
+      @host_aliases = @class.attrclass(:host_aliases).new(:resource => @resource, :should => %w{foo bar})
+      @host_aliases.insync?(%w{foo bar}).should == true
+      @host_aliases.insync?(%w{bar foo}).should == false
+    end
+
+    it "should not consider aliases to be in sync if should is a subset of current" do
+      @host_aliases = @class.attrclass(:host_aliases).new(:resource => @resource, :should => %w{foo bar})
+      @host_aliases.insync?(%w{foo bar anotherone}).should == false
+    end
+
+  end
+end