puppet 3.2.4 → 3.3.0.rc2

data/spec/unit/type/package_spec.rb

@@ -74,7 +74,7 @@ describe Puppet::Type.type(:package) do
 
     it "should not support :purged as a value to :ensure if the provider does not have the :purgeable feature" do
       @provider.expects(:satisfies?).with([:purgeable]).returns(false)
-      proc { Puppet::Type.type(:package).new(:name => "yay", :ensure => :purged) }.should raise_error(Puppet::Error)
+      expect { Puppet::Type.type(:package).new(:name => "yay", :ensure => :purged) }.to raise_error(Puppet::Error)
     end
 
     it "should support :latest as a value to :ensure if the provider has the :upgradeable feature" do
@@ -84,7 +84,7 @@ describe Puppet::Type.type(:package) do
 
     it "should not support :latest as a value to :ensure if the provider does not have the :upgradeable feature" do
       @provider.expects(:satisfies?).with([:upgradeable]).returns(false)
-      proc { Puppet::Type.type(:package).new(:name => "yay", :ensure => :latest) }.should raise_error(Puppet::Error)
+      expect { Puppet::Type.type(:package).new(:name => "yay", :ensure => :latest) }.to raise_error(Puppet::Error)
     end
 
     it "should support version numbers as a value to :ensure if the provider has the :versionable feature" do
@@ -94,11 +94,11 @@ describe Puppet::Type.type(:package) do
 
     it "should not support version numbers as a value to :ensure if the provider does not have the :versionable feature" do
       @provider.expects(:satisfies?).with([:versionable]).returns(false)
-      proc { Puppet::Type.type(:package).new(:name => "yay", :ensure => "1.0") }.should raise_error(Puppet::Error)
+      expect { Puppet::Type.type(:package).new(:name => "yay", :ensure => "1.0") }.to raise_error(Puppet::Error)
     end
 
     it "should accept any string as an argument to :source" do
-      proc { Puppet::Type.type(:package).new(:name => "yay", :source => "stuff") }.should_not raise_error(Puppet::Error)
+      expect { Puppet::Type.type(:package).new(:name => "yay", :source => "stuff") }.to_not raise_error
     end
   end
 

data/spec/unit/type/resources_spec.rb

@@ -21,11 +21,40 @@ describe resources do
     end
   end
 
+  describe :purge do
+    let (:instance) { described_class.new(:name => 'file') }
+
+    it "defaults to false" do
+      instance[:purge].should be_false
+    end
+
+    it "can be set to false" do
+      instance[:purge] = 'false'
+    end
+
+    it "cannot be set to true for a resource type that does not accept ensure" do
+      instance.resource_type.stubs(:respond_to?).returns true
+      instance.resource_type.stubs(:validproperty?).returns false
+      expect { instance[:purge] = 'yes' }.to raise_error Puppet::Error
+    end
+
+    it "cannot be set to true for a resource type that does not have instances" do
+      instance.resource_type.stubs(:respond_to?).returns false
+      instance.resource_type.stubs(:validproperty?).returns true
+      expect { instance[:purge] = 'yes' }.to raise_error Puppet::Error
+    end
+
+    it "can be set to true for a resource type that has instances and can accept ensure" do
+      instance.resource_type.stubs(:respond_to?).returns true
+      instance.resource_type.stubs(:validproperty?).returns true
+      expect { instance[:purge] = 'yes' }.not_to raise_error Puppet::Error
+    end
+  end
+
   describe "#generate" do
     before do
       @host1 = Puppet::Type.type(:host).new(:name => 'localhost', :ip => '127.0.0.1')
       @catalog = Puppet::Resource::Catalog.new
-      @context = Puppet::Transaction.new(@catalog)
     end
 
       describe "when dealing with non-purging resources" do

data/spec/unit/type/user_spec.rb

@@ -15,7 +15,7 @@ describe Puppet::Type.type(:user) do
     described_class.stubs(:defaultprovider).returns @provider_class
   end
 
-  it "should be able to create a instance" do
+  it "should be able to create an instance" do
     described_class.new(:name => "foo").should_not be_nil
   end
 
@@ -23,11 +23,11 @@ describe Puppet::Type.type(:user) do
     described_class.provider_feature(:allows_duplicates).should_not be_nil
   end
 
-  it "should have an manages_homedir feature" do
+  it "should have a manages_homedir feature" do
     described_class.provider_feature(:manages_homedir).should_not be_nil
   end
 
-  it "should have an manages_passwords feature" do
+  it "should have a manages_passwords feature" do
     described_class.provider_feature(:manages_passwords).should_not be_nil
   end
 
@@ -47,6 +47,29 @@ describe Puppet::Type.type(:user) do
     described_class.provider_feature(:system_users).should_not be_nil
   end
 
+  describe :managehome do
+    let (:provider) { @provider_class.new(:name => 'foo', :ensure => :absent) }
+    let (:instance) { described_class.new(:name => 'foo', :provider => provider) }
+
+    it "defaults to false" do
+      instance[:managehome].should be_false
+    end
+
+    it "can be set to false" do
+      instance[:managehome] = 'false'
+    end
+
+    it "cannot be set to true for a provider that does not manage homedirs" do
+      provider.class.stubs(:manages_homedir?).returns false
+      expect { instance[:managehome] = 'yes' }.to raise_error Puppet::Error
+    end
+
+    it "can be set to true for a provider that does manage homedirs" do
+      provider.class.stubs(:manages_homedir?).returns true
+      instance[:managehome] = 'yes'
+    end
+  end
+
   describe "instances" do
     it "should delegate existence questions to its provider" do
       @provider = @provider_class.new(:name => 'foo', :ensure => :absent)

data/spec/unit/type/yumrepo_spec.rb

@@ -2,46 +2,42 @@
 
 require 'spec_helper'
 
-
 describe Puppet::Type.type(:yumrepo) do
   include PuppetSpec::Files
 
   describe "When validating attributes" do
-
     it "should have a 'name' parameter'" do
       Puppet::Type.type(:yumrepo).new(:name => "puppetlabs")[:name].should == "puppetlabs"
     end
 
     [:baseurl, :cost, :descr, :enabled, :enablegroups, :exclude, :failovermethod, :gpgcheck, :gpgkey, :http_caching, 
        :include, :includepkgs, :keepalive, :metadata_expire, :mirrorlist, :priority, :protect, :proxy, :proxy_username, :proxy_password, :timeout, 
-       :sslcacert, :sslverify, :sslclientcert, :sslclientkey].each do |param|
+       :sslcacert, :sslverify, :sslclientcert, :sslclientkey, :s3_enabled].each do |param|
       it "should have a '#{param}' parameter" do
         Puppet::Type.type(:yumrepo).attrtype(param).should == :property
-     end
+      end
     end
-
   end
 
   describe "When validating attribute values" do
-    
     [:cost, :enabled, :enablegroups, :failovermethod, :gpgcheck, :http_caching, :keepalive, :metadata_expire, :priority, :protect, :timeout].each do |param|
       it "should support :absent as a value to '#{param}' parameter" do
         Puppet::Type.type(:yumrepo).new(:name => "puppetlabs.repo", param => :absent)
-     end
+      end
     end
 
     [:cost, :enabled, :enablegroups, :gpgcheck, :keepalive, :metadata_expire, :priority, :protect, :timeout].each do |param|
       it "should fail if '#{param}' is not a number" do
         lambda { Puppet::Type.type(:yumrepo).new(:name => "puppetlabs", param => "notanumber") }.should raise_error
-     end
+      end
     end
 
-    [:enabled, :enabledgroups, :gpgcheck, :keepalive, :protect].each do |param|
+    [:enabled, :enabledgroups, :gpgcheck, :keepalive, :protect, :s3_enabled].each do |param|
       it "should fail if '#{param}' does not have one of the following values (0|1)" do
         lambda { Puppet::Type.type(:yumrepo).new(:name => "puppetlabs", param => "2") }.should raise_error
       end
     end
-    
+
     it "should fail if 'failovermethod' does not have one of the following values (roundrobin|priority)" do
       lambda { Puppet::Type.type(:yumrepo).new(:name => "puppetlabs", :failovermethod => "notavalidvalue") }.should raise_error
     end
@@ -58,13 +54,10 @@ describe Puppet::Type.type(:yumrepo) do
       Puppet::Type.type(:yumrepo).new(:name => "puppetlabs", :sslverify => "True")[:sslverify].should == "True"
       Puppet::Type.type(:yumrepo).new(:name => "puppetlabs", :sslverify => "False")[:sslverify].should == "False"
     end
-
   end
 
   # these tests were ported from the old spec/unit/type/yumrepo_spec.rb, pretty much verbatim
   describe "When manipulating config file" do
-
-
     def make_repo(name, hash={})
       hash[:name] = name
       Puppet::Type.type(:yumrepo).new(hash)
@@ -86,8 +79,6 @@ describe Puppet::Type.type(:yumrepo) do
       end
     end
 
-
-
     before(:each) do
       @yumdir = tmpdir("yumrepo_spec_tmpdir")
       @yumconf = File.join(@yumdir, "yum.conf")
@@ -100,7 +91,6 @@ describe Puppet::Type.type(:yumrepo) do
       Puppet::Type.type(:yumrepo).inifile = nil
     end
 
-
     it "should be able to create a valid config file" do
       values = {
           :descr => "Fedora Core $releasever - $basearch - Base",
@@ -115,7 +105,6 @@ describe Puppet::Type.type(:yumrepo) do
       }
       repo = make_repo("base", values)
 
-
       catalog = Puppet::Resource::Catalog.new
       # Stop Puppet from doing a bunch of magic; might want to think about a util for specs that handles this
       catalog.host_config = false
@@ -129,10 +118,8 @@ describe Puppet::Type.type(:yumrepo) do
       text.should == EXPECTED_CONTENTS_FOR_CREATED_FILE
     end
 
-
     # Modify one existing section
     it "should be able to modify an existing config file" do
-
       create_data_files
 
       devel = make_repo("development", { :descr => "New description" })
@@ -140,7 +127,7 @@ describe Puppet::Type.type(:yumrepo) do
 
       devel[:name].should == "development"
       current_values[devel.property(:descr)].should == 'Fedora Core $releasever - Development Tree'
-      devel.property(:descr).should == 'New description'
+      devel[:descr].should == 'New description'
 
       catalog = Puppet::Resource::Catalog.new
       # Stop Puppet from doing a bunch of magic; might want to think about a util for specs that handles this
@@ -155,7 +142,6 @@ describe Puppet::Type.type(:yumrepo) do
       all_sections(inifile).should == ['base', 'development', 'main']
     end
 
-
     # Delete mirrorlist by setting it to :absent and enable baseurl
     it "should support 'absent' value" do
       create_data_files
@@ -180,14 +166,9 @@ describe Puppet::Type.type(:yumrepo) do
       sec["mirrorlist"].should == nil
       sec["baseurl"].should == baseurl
     end
-
-
   end
-
-
 end
 
-
 EXPECTED_CONTENTS_FOR_CREATED_FILE = <<'EOF'
 [base]
 name=Fedora Core $releasever - $basearch - Base
@@ -200,7 +181,6 @@ proxy_username=username
 proxy_password=password
 EOF
 
-
 FEDORA_REPO_FILE = <<END
 [base]
 name=Fedora Core $releasever - $basearch - Base

data/spec/unit/type/zone_spec.rb

@@ -59,6 +59,7 @@ describe Puppet::Type.type(:zone) do
     fs = 'random-pool/some-zfs'
 
     catalog = Puppet::Resource::Catalog.new
+    relationship_graph = Puppet::Graph::RelationshipGraph.new(Puppet::Graph::RandomPrioritizer.new)
     zfs = Puppet::Type.type(:zfs).new(:name => fs)
     catalog.add_resource zfs
 
@@ -69,7 +70,9 @@ describe Puppet::Type.type(:zone) do
                                :provider => :solaris)
     catalog.add_resource zone
 
-    catalog.relationship_graph.dependencies(zone).should == [zfs]
+
+    relationship_graph.populate_from(catalog)
+    relationship_graph.dependencies(zone).should == [zfs]
   end
   describe StateMachine do
     let (:sm) { StateMachine.new }

data/spec/unit/type_spec.rb

@@ -105,26 +105,30 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     Puppet::Type.type(:mount).new(:name => "foo").must respond_to(:virtual?)
   end
 
-  it "should consider its version to be its catalog version" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo")
-    catalog = Puppet::Resource::Catalog.new
-    catalog.version = 50
-    catalog.add_resource resource
-
-    resource.version.should == 50
-  end
-
   it "should consider its version to be zero if it has no catalog" do
     Puppet::Type.type(:mount).new(:name => "foo").version.should == 0
   end
 
-  it "should provide source_descriptors" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo")
-    catalog = Puppet::Resource::Catalog.new
-    catalog.version = 50
-    catalog.add_resource resource
+  context "resource attributes" do
+    let(:resource) {
+      resource = Puppet::Type.type(:mount).new(:name => "foo")
+      catalog = Puppet::Resource::Catalog.new
+      catalog.version = 50
+      catalog.add_resource resource
+      resource
+    }
+
+    it "should consider its version to be its catalog version" do
+      resource.version.should == 50
+    end
 
-    resource.source_descriptors.should == {:tags=>["mount", "foo"], :path=>"/Mount[foo]"}
+    it "should have tags" do
+      resource.tags.should == ["mount", "foo"]
+    end
+
+    it "should have a path" do
+      resource.path.should == "/Mount[foo]"
+    end
   end
 
   it "should consider its type to be the name of its class" do
@@ -313,10 +317,10 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should copy the resource's parameters as its own" do
-        resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:atboot => true, :fstype => "boo"})
+        resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:atboot => :yes, :fstype => "boo"})
         params = Puppet::Type.type(:mount).new(resource).to_hash
         params[:fstype].should == "boo"
-        params[:atboot].should == true
+        params[:atboot].should == :yes
       end
     end
 
@@ -349,9 +353,9 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should use any remaining hash keys as its parameters" do
-        resource = Puppet::Type.type(:mount).new(:title => "/foo", :catalog => "foo", :atboot => true, :fstype => "boo")
+        resource = Puppet::Type.type(:mount).new(:title => "/foo", :catalog => "foo", :atboot => :yes, :fstype => "boo")
         resource[:fstype].must == "boo"
-        resource[:atboot].must == true
+        resource[:atboot].must == :yes
       end
     end
 
@@ -382,12 +386,12 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should fail if no title, name, or namevar are provided" do
-      expect { Puppet::Type.type(:file).new(:atboot => true) }.to raise_error(Puppet::Error)
+      expect { Puppet::Type.type(:mount).new(:atboot => :yes) }.to raise_error(Puppet::Error)
     end
 
     it "should set the attributes in the order returned by the class's :allattrs method" do
       Puppet::Type.type(:mount).stubs(:allattrs).returns([:name, :atboot, :noop])
-      resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => "myboot", :noop => "whatever"})
+      resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => :yes, :noop => "whatever"})
 
       set = []
 
@@ -404,7 +408,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
     it "should always set the name and then default provider before anything else" do
       Puppet::Type.type(:mount).stubs(:allattrs).returns([:provider, :name, :atboot])
-      resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => "myboot"})
+      resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => :yes})
 
       set = []
 
@@ -429,7 +433,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should retain a copy of the originally provided parameters" do
-      Puppet::Type.type(:mount).new(:name => "foo", :atboot => true, :noop => false).original_parameters.should == {:atboot => true, :noop => false}
+      Puppet::Type.type(:mount).new(:name => "foo", :atboot => :yes, :noop => false).original_parameters.should == {:atboot => :yes, :noop => false}
     end
 
     it "should delete the name via the namevar from the originally provided parameters" do
@@ -535,9 +539,9 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should set the name of the returned resource if its own name and title differ" do
-      @resource[:name] = "my name"
+      @resource[:name] = "myname"
       @resource.title = "other name"
-      @resource.retrieve_resource[:name].should == "my name"
+      @resource.retrieve_resource[:name].should == "myname"
     end
 
     it "should provide a value for all set properties" do
@@ -802,18 +806,47 @@ describe Puppet::Type::RelationshipMetaparam do
     Puppet::Type.metaparamclass(:require).new(:resource => mock("resource")).should respond_to(:validate_relationship)
   end
 
-  it "should fail if any specified resource is not found in the catalog" do
-    catalog = mock 'catalog'
-    resource = stub 'resource', :catalog => catalog, :ref => "resource"
+  describe 'if any specified resource is not in the catalog' do
+    let(:catalog) { mock 'catalog' }
 
-    param = Puppet::Type.metaparamclass(:require).new(:resource => resource, :value => %w{Foo[bar] Class[test]})
+    let(:resource) do
+      stub 'resource',
+        :catalog => catalog,
+        :ref     => 'resource',
+        :line=   => nil,
+        :file=   => nil
+    end
+
+    let(:param) { Puppet::Type.metaparamclass(:require).new(:resource => resource, :value => %w{Foo[bar] Class[test]}) }
 
-    catalog.expects(:resource).with("Foo[bar]").returns "something"
-    catalog.expects(:resource).with("Class[Test]").returns nil
+    before do
+      catalog.expects(:resource).with("Foo[bar]").returns "something"
+      catalog.expects(:resource).with("Class[Test]").returns nil
+    end
 
-    param.expects(:fail).with { |string| string.include?("Class[Test]") }
+    describe "and the resource doesn't have a file or line number" do
+      it "raises an error" do
+        expect { param.validate_relationship }.to raise_error do |error|
+          error.should be_a Puppet::ResourceError
+          error.message.should match %r[Class\[Test\]]
+        end
+      end
+    end
 
-    param.validate_relationship
+    describe "and the resource has a file or line number" do
+      before do
+        resource.stubs(:line).returns '42'
+        resource.stubs(:file).returns '/hitchhikers/guide/to/the/galaxy'
+      end
+
+      it "raises an error with context" do
+        expect { param.validate_relationship }.to raise_error do |error|
+          error.should be_a Puppet::ResourceError
+          error.message.should match %r[Class\[Test\]]
+          error.message.should match %r["in /hitchhikers/guide/to/the/galaxy:42"]
+        end
+      end
+    end
   end
 end