puppet 3.2.4 → 3.3.0.rc2

data/spec/unit/provider/user/directoryservice_spec.rb

@@ -228,7 +228,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       {
         'UniqueID'         => '1000',
         'RealName'         => resource[:name],
-        'PrimaryGroupID'   => '20',
+        'PrimaryGroupID'   => 20,
         'UserShell'        => '/bin/bash',
         'NFSHomeDirectory' => "/Users/#{resource[:name]}"
       }
@@ -266,6 +266,13 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       provider.expects(:merge_attribute_with_dscl).with('Groups', 'somegroup', 'GroupMembers', 'GUID')
       provider.create
     end
+
+    it 'should convert group names into integers' do
+      resource[:gid] = 'somegroup'
+      Puppet::Util.expects(:gid).with('somegroup').returns(21)
+      provider.expects(:merge_attribute_with_dscl).with('Users', username, 'PrimaryGroupID', 21)
+      provider.create
+    end
   end
 
   describe 'self#instances' do
@@ -599,7 +606,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
         }]
     end
 
-    it 'should return a array of hashes containing group data' do
+    it 'should return an array of hashes containing group data' do
       provider.class.expects(:dscl).with('-plist', '.', 'readall', '/Groups').returns(groups_xml)
       provider.class.get_list_of_groups.should == groups_hash
     end
@@ -696,7 +703,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     let(:password_hash_file) { '/var/db/shadow/hash/user_guid' }
     let(:stub_password_file) { stub('connection') }
 
-    it 'should return a a sha1 hash read from disk' do
+    it 'should return a sha1 hash read from disk' do
       File.expects(:exists?).with(password_hash_file).returns(true)
       File.expects(:file?).with(password_hash_file).returns(true)
       File.expects(:readable?).with(password_hash_file).returns(true)
@@ -773,7 +780,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       }
     end
 
-    it 'should call set_salted_sha512 on 10.7 when given a a salted-SHA512 password hash' do
+    it 'should call set_salted_sha512 on 10.7 when given a salted-SHA512 password hash' do
       provider.expects(:get_users_plist).returns(sample_users_plist)
       provider.expects(:get_shadow_hash_data).with(sample_users_plist).returns(sha512_shadowhashdata)
       provider.class.expects(:get_os_version).returns('10.7')

data/spec/unit/provider/user/user_role_add_spec.rb

@@ -267,6 +267,7 @@ FIXTURE
     end
 
     it "should only update the target user" do
+      Date.expects(:today).returns Date.new(2011,12,07)
       write_fixture <<FIXTURE
 before:seriously:15315:0:99999:7:::
 fakeval:seriously:15315:0:99999:7:::
@@ -294,6 +295,23 @@ FIXTURE
       provider.password = "totally"
       File.read(path).should == fixture
     end
+
+    it "should update the lastchg field" do
+      Date.expects(:today).returns Date.new(2013,5,12) # 15837 days after 1970-01-01
+      write_fixture <<FIXTURE
+before:seriously:15315:0:99999:7:::
+fakeval:seriously:15629:0:99999:7:::
+fakevalish:seriously:15315:0:99999:7:::
+after:seriously:15315:0:99999:7:::
+FIXTURE
+      provider.password = "totally"
+      File.read(path).should == <<EOT
+before:seriously:15315:0:99999:7:::
+fakeval:totally:15837:0:99999:7:::
+fakevalish:seriously:15315:0:99999:7:::
+after:seriously:15315:0:99999:7:::
+EOT
+    end
   end
 
   describe "#shadow_entry" do

data/spec/unit/provider_spec.rb

@@ -448,28 +448,17 @@ describe Puppet::Provider do
 
     fields = %w{prop1 prop2 param1 param2}
 
-    # This is needed for Ruby 1.8.5, which throws an exception that the
-    # default rescue doesn't catch if the method isn't present.  Also, it has
-    # no convenient predicate for them, which equally hurts.
-    def has_method?(object, name)
-      begin
-        return true if object.instance_method(name)
-      rescue Exception
-        return false
-      end
-    end
-
     fields.each do |name|
       it "should add getter methods for #{name}" do
         expect { subject.mk_resource_methods }.
-          to change { has_method?(subject, name) }.
+          to change { subject.method_defined?(name) }.
           from(false).to(true)
       end
 
       it "should add setter methods for #{name}" do
         method = name + '='
         expect { subject.mk_resource_methods }.
-          to change { has_method?(subject, name) }.
+          to change { subject.method_defined?(name) }.
           from(false).to(true)
       end
     end

data/spec/unit/reports/http_spec.rb

@@ -89,7 +89,7 @@ describe processor do
         end
       end
 
-      if code.to_i >= 300
+      if code.to_i >= 300 && ![301, 302, 307].include?(code.to_i)
         it "should log error on http code #{code}" do
           response = klass.new('1.1', code, '')
           http.expects(:post).returns(response)

data/spec/unit/resource/catalog_spec.rb

@@ -260,7 +260,9 @@ describe Puppet::Resource::Catalog, "when compiling" do
 
     it "should add resources to the relationship graph if it exists" do
       relgraph = @catalog.relationship_graph
+
       @catalog.add_resource @one
+
       relgraph.should be_vertex(@one)
     end
 
@@ -275,6 +277,21 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.vertices.find { |r| r.ref == @one.ref }.must equal(@one)
     end
 
+    it "tracks the container through edges" do
+      @catalog.add_resource(@two)
+      @catalog.add_resource(@one)
+
+      @catalog.add_edge(@one, @two)
+
+      @catalog.container_of(@two).must == @one
+    end
+
+    it "a resource without a container is contained in nil" do
+      @catalog.add_resource(@one)
+
+      @catalog.container_of(@one).must be_nil
+    end
+
     it "should canonize how resources are referred to during retrieval when both type and title are provided" do
       @catalog.add_resource(@one)
       @catalog.resource("notify", "one").must equal(@one)
@@ -311,10 +328,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
       end
     end
 
-    it "should not store objects that do not respond to :ref" do
-      proc { @catalog.add_resource("thing") }.should raise_error(ArgumentError)
-    end
-
     it "should remove all resources when asked" do
       @catalog.add_resource @one
       @catalog.add_resource @two
@@ -523,10 +536,9 @@ describe Puppet::Resource::Catalog, "when compiling" do
     before :each do
       @catalog = Puppet::Resource::Catalog.new("host")
 
-      @transaction = Puppet::Transaction.new(@catalog)
+      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::RandomPrioritizer.new)
       Puppet::Transaction.stubs(:new).returns(@transaction)
       @transaction.stubs(:evaluate)
-      @transaction.stubs(:add_times)
       @transaction.stubs(:for_network_device=)
 
       Puppet.settings.stubs(:use)
@@ -537,18 +549,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.apply
     end
 
-    it "should provide the catalog retrieval time to the transaction" do
-      @catalog.retrieval_duration = 5
-      @transaction.expects(:add_times).with(:config_retrieval => 5)
-      @catalog.apply
-    end
-
-    it "should use a retrieval time of 0 if none is set in the catalog" do
-      @catalog.retrieval_duration = nil
-      @transaction.expects(:add_times).with(:config_retrieval => 0)
-      @catalog.apply
-    end
-
     it "should return the transaction" do
       @catalog.apply.should equal(@transaction)
     end
@@ -627,90 +627,15 @@ describe Puppet::Resource::Catalog, "when compiling" do
 
   describe "when creating a relationship graph" do
     before do
-      Puppet::Type.type(:component)
       @catalog = Puppet::Resource::Catalog.new("host")
-      @compone = Puppet::Type::Component.new :name => "one"
-      @comptwo = Puppet::Type::Component.new :name => "two", :require => "Class[one]"
-      @file = Puppet::Type.type(:file)
-      @one = @file.new :path => @basepath+"/one"
-      @two = @file.new :path => @basepath+"/two"
-      @sub = @file.new :path => @basepath+"/two/subdir"
-      @catalog.add_edge @compone, @one
-      @catalog.add_edge @comptwo, @two
-
-      @three = @file.new :path => @basepath+"/three"
-      @four = @file.new :path => @basepath+"/four", :require => "File[#{@basepath}/three]"
-      @five = @file.new :path => @basepath+"/five"
-      @catalog.add_resource @compone, @comptwo, @one, @two, @three, @four, @five, @sub
-
-      @relationships = @catalog.relationship_graph
-    end
-
-    it "should be able to create a relationship graph" do
-      @relationships.should be_instance_of(Puppet::SimpleGraph)
-    end
-
-    it "should not have any components" do
-      @relationships.vertices.find { |r| r.instance_of?(Puppet::Type::Component) }.should be_nil
-    end
-
-    it "should have all non-component resources from the catalog" do
-      # The failures print out too much info, so i just do a class comparison
-      @relationships.vertex?(@five).should be_true
-    end
-
-    it "should have all resource relationships set as edges" do
-      @relationships.edge?(@three, @four).should be_true
-    end
-
-    it "should copy component relationships to all contained resources" do
-      @relationships.path_between(@one, @two).should be
-    end
-
-    it "should add automatic relationships to the relationship graph" do
-      @relationships.edge?(@two, @sub).should be_true
     end
 
     it "should get removed when the catalog is cleaned up" do
-      @relationships.expects(:clear)
-      @catalog.clear
-      @catalog.instance_variable_get("@relationship_graph").should be_nil
-    end
+      @catalog.relationship_graph.expects(:clear)
 
-    it "should write :relationships and :expanded_relationships graph files if the catalog is a host catalog" do
       @catalog.clear
-      graph = Puppet::SimpleGraph.new
-      Puppet::SimpleGraph.expects(:new).returns graph
-
-      graph.expects(:write_graph).with(:relationships)
-      graph.expects(:write_graph).with(:expanded_relationships)
-
-      @catalog.host_config = true
 
-      @catalog.relationship_graph
-    end
-
-    it "should not write graph files if the catalog is not a host catalog" do
-      @catalog.clear
-      graph = Puppet::SimpleGraph.new
-      Puppet::SimpleGraph.expects(:new).returns graph
-
-      graph.expects(:write_graph).never
-
-      @catalog.host_config = false
-
-      @catalog.relationship_graph
-    end
-
-    it "should create a new relationship graph after clearing the old one" do
-      @relationships.expects(:clear)
-      @catalog.clear
-      @catalog.relationship_graph.should be_instance_of(Puppet::SimpleGraph)
-    end
-
-    it "should remove removed resources from the relationship graph if it exists" do
-      @catalog.remove_resource(@one)
-      @catalog.relationship_graph.vertex?(@one).should be_false
+      @catalog.instance_variable_get("@relationship_graph").should be_nil
     end
   end
 
@@ -902,8 +827,9 @@ describe Puppet::Resource::Catalog, "when converting from pson" do
   it 'should convert the resources list into resources and add each of them' do
     @data['resources'] = [Puppet::Resource.new(:file, "/foo"), Puppet::Resource.new(:file, "/bar")]
 
-    @catalog.expects(:add_resource).times(2).with { |res| res.type == "File" }
-    PSON.parse @pson.to_pson
+    catalog = PSON.parse @pson.to_pson
+
+    catalog.resources.collect(&:ref) == ["File[/foo]", "File[/bar]"]
   end
 
   it 'should convert resources even if they do not include "type" information' do

data/spec/unit/resource/resource_type.json

@@ -0,0 +1,34 @@
+{
+  "type": "object",
+  "properties": {
+    "doc": {
+      "type": "string"
+    },
+    "line": {
+      "type": "integer"
+    },
+    "file": {
+      "type": "string"
+    },
+    "parent": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string",
+      "required": "true"
+    },
+    "kind": {
+      "type": "string",
+      "enum": [
+        "class",
+        "node",
+        "defined_type"
+      ],
+      "required": "true"
+    },
+    "parameters": {
+      "type": "object"
+    }
+  },
+  "additionalProperties": false
+}

data/spec/unit/resource/status_spec.rb

@@ -8,6 +8,8 @@ describe Puppet::Resource::Status do
 
   before do
     @resource = Puppet::Type.type(:file).new :path => make_absolute("/my/file")
+    @containment_path = ["foo", "bar", "baz"]
+    @resource.stubs(:pathbuilder).returns @containment_path
     @status = Puppet::Resource::Status.new(@resource)
   end
 
@@ -44,6 +46,10 @@ describe Puppet::Resource::Status do
     Puppet::Resource::Status.new(@resource).source_description.should == "/my/path"
   end
 
+  it "should set its containment path" do
+    Puppet::Resource::Status.new(@resource).containment_path.should == @containment_path
+  end
+
   [:file, :line].each do |attr|
     it "should copy the resource's #{attr}" do
       @resource.expects(attr).returns "foo"
@@ -151,4 +157,54 @@ describe Puppet::Resource::Status do
       @status.to_yaml_properties.should =~ Puppet::Resource::Status::YAML_ATTRIBUTES
     end
   end
+
+  it "should round trip through pson" do
+    @status.file = "/foo.rb"
+    @status.line = 27
+    @status.evaluation_time = 2.7
+    @status.tags = %w{one two}
+    @status << Puppet::Transaction::Event.new(:name => :mode_changed, :status => 'audit')
+    @status.failed = false
+    @status.changed = true
+    @status.out_of_sync = true
+    @status.skipped = false
+
+    @status.containment_path.should == @containment_path
+
+    tripped = Puppet::Resource::Status.from_pson(PSON.parse(@status.to_pson))
+
+    tripped.title.should == @status.title
+    tripped.containment_path.should == @status.containment_path
+    tripped.file.should == @status.file
+    tripped.line.should == @status.line
+    tripped.resource.should == @status.resource
+    tripped.resource_type.should == @status.resource_type
+    tripped.evaluation_time.should == @status.evaluation_time
+    tripped.tags.should == @status.tags
+    tripped.time.should == @status.time
+    tripped.failed.should == @status.failed
+    tripped.changed.should == @status.changed
+    tripped.out_of_sync.should == @status.out_of_sync
+    tripped.skipped.should == @status.skipped
+
+    tripped.change_count.should == @status.change_count
+    tripped.out_of_sync_count.should == @status.out_of_sync_count
+    events_as_hashes(tripped).should == events_as_hashes(@status)
+  end
+
+  def events_as_hashes(report)
+    report.events.collect do |e|
+      {
+        :audited => e.audited,
+        :property => e.property,
+        :previous_value => e.previous_value,
+        :desired_value => e.desired_value,
+        :historical_value => e.historical_value,
+        :message => e.message,
+        :name => e.name,
+        :status => e.status,
+        :time => e.time,
+      }
+    end
+  end
 end

data/spec/unit/resource/type_collection_spec.rb

@@ -190,7 +190,7 @@ describe Puppet::Resource::TypeCollection do
         @code.loader.expects(:try_load_fqname).with(:hostclass, "klass").returns(nil)
         @code.find_hostclass("Ns", "Klass").should be_nil
 
-        Puppet.expects(:warning).at_least_once.with {|msg| msg =~ /Not attempting to load hostclass/}
+        Puppet.expects(:debug).at_least_once.with {|msg| msg =~ /Not attempting to load hostclass/}
         @code.find_hostclass("Ns", "Klass").should be_nil
       end
     end
@@ -369,7 +369,7 @@ describe Puppet::Resource::TypeCollection do
   describe "when managing files" do
     before do
       @loader = Puppet::Resource::TypeCollection.new("env")
-      Puppet::Util::LoadedFile.stubs(:new).returns stub("watched_file")
+      Puppet::Util::WatchedFile.stubs(:new).returns stub("watched_file")
     end
 
     it "should have a method for specifying a file should be watched" do
@@ -381,15 +381,15 @@ describe Puppet::Resource::TypeCollection do
       @loader.should be_watching_file("/foo/bar")
     end
 
-    it "should use LoadedFile to watch files" do
-      Puppet::Util::LoadedFile.expects(:new).with("/foo/bar").returns stub("watched_file")
+    it "should use WatchedFile to watch files" do
+      Puppet::Util::WatchedFile.expects(:new).with("/foo/bar").returns stub("watched_file")
       @loader.watch_file("/foo/bar")
     end
 
     it "should be considered stale if any files have changed" do
       file1 = stub 'file1', :changed? => false
       file2 = stub 'file2', :changed? => true
-      Puppet::Util::LoadedFile.expects(:new).times(2).returns(file1).then.returns(file2)
+      Puppet::Util::WatchedFile.expects(:new).times(2).returns(file1).then.returns(file2)
       @loader.watch_file("/foo/bar")
       @loader.watch_file("/other/bar")
 
@@ -399,7 +399,7 @@ describe Puppet::Resource::TypeCollection do
     it "should not be considered stable if no files have changed" do
       file1 = stub 'file1', :changed? => false
       file2 = stub 'file2', :changed? => false
-      Puppet::Util::LoadedFile.expects(:new).times(2).returns(file1).then.returns(file2)
+      Puppet::Util::WatchedFile.expects(:new).times(2).returns(file1).then.returns(file2)
       @loader.watch_file("/foo/bar")
       @loader.watch_file("/other/bar")