puppet 3.4.3 → 3.5.0.rc1

data/spec/unit/ssl/inventory_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::SSL::Inventory, :unless => Puppet.features.microsoft_windows? d
     before do
       Puppet[:cert_inventory] = cert_inventory
 
-      Puppet::FileSystem::File.stubs(:exist?).with(cert_inventory).returns true
+      Puppet::FileSystem.stubs(:exist?).with(cert_inventory).returns true
 
       @inventory = @class.new
 
@@ -117,7 +117,7 @@ describe Puppet::SSL::Inventory, :unless => Puppet.features.microsoft_windows? d
 
     describe "and finding a serial number" do
       it "should return nil if the inventory file is missing" do
-        Puppet::FileSystem::File.expects(:exist?).with(cert_inventory).returns false
+        Puppet::FileSystem.expects(:exist?).with(cert_inventory).returns false
         @inventory.serial(:whatever).should be_nil
       end
 

data/spec/unit/ssl/key_spec.rb

@@ -71,7 +71,7 @@ describe Puppet::SSL::Key do
     end
 
     it "should not try to use the provided password file if the file does not exist" do
-      Puppet::FileSystem::File.stubs(:exist?).returns false
+      Puppet::FileSystem.stubs(:exist?).returns false
       @key.password_file = "/path/to/password"
 
       path = "/my/path"
@@ -84,7 +84,7 @@ describe Puppet::SSL::Key do
     end
 
     it "should read the key with the password retrieved from the password file if one is provided" do
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       @key.password_file = "/path/to/password"
 
       path = "/my/path"
@@ -154,7 +154,7 @@ describe Puppet::SSL::Key do
 
     describe "with a password file set" do
       it "should return a nil password if the password file does not exist" do
-        Puppet::FileSystem::File.expects(:exist?).with("/path/to/pass").returns false
+        Puppet::FileSystem.expects(:exist?).with("/path/to/pass").returns false
         File.expects(:read).with("/path/to/pass").never
 
         @instance.password_file = "/path/to/pass"
@@ -163,7 +163,7 @@ describe Puppet::SSL::Key do
       end
 
       it "should return the contents of the password file as its password" do
-        Puppet::FileSystem::File.expects(:exist?).with("/path/to/pass").returns true
+        Puppet::FileSystem.expects(:exist?).with("/path/to/pass").returns true
         File.expects(:read).with("/path/to/pass").returns "my password"
 
         @instance.password_file = "/path/to/pass"

data/spec/unit/status_spec.rb

@@ -1,7 +1,11 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
+require 'matchers/json'
+
 describe Puppet::Status do
+  include JSONMatchers
+
   it "should implement find" do
     Puppet::Status.indirection.find( :default ).should be_is_a(Puppet::Status)
     Puppet::Status.indirection.find( :default ).status["is_alive"].should == true
@@ -38,12 +42,10 @@ describe Puppet::Status do
     new_status.should equal_attributes_of(status)
   end
 
-  it "serializes to PSON that conforms to the status schema", :unless => Puppet.features.microsoft_windows? do
-    schema = JSON.parse(File.read('api/schemas/status.json'))
+  it "serializes to PSON that conforms to the status schema" do
     status = Puppet::Status.new
     status.version = Puppet.version
 
-    JSON::Validator.validate!(JSON_META_SCHEMA, schema)
-    JSON::Validator.validate!(schema, status.render('pson'))
+    expect(status.render('pson')).to validate_against('api/schemas/status.json')
   end
 end

data/spec/unit/transaction/additional_resource_generator_spec.rb

@@ -3,11 +3,13 @@ require 'puppet/transaction'
 require 'puppet_spec/compiler'
 require 'matchers/relationship_graph_matchers'
 require 'matchers/include_in_order'
+require 'matchers/resource'
 
 describe Puppet::Transaction::AdditionalResourceGenerator do
   include PuppetSpec::Compiler
   include PuppetSpec::Files
   include RelationshipGraphMatchers
+  include Matchers::Resource
 
   let(:prioritizer) { Puppet::Graph::SequentialPrioritizer.new }
 
@@ -139,7 +141,7 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
       expect(catalog).to contain_resources_equally('Generator[thing]', 'Notify[hello]')
     end
 
-    it "should return false if an error occured when generating resources" do
+    it "should return false if an error occurred when generating resources" do
       catalog = compile_to_ral(<<-MANIFEST)
         generator { thing:
           code => 'fail("not a good generation")'
@@ -407,13 +409,3 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
     end
   end
 end
-
-RSpec::Matchers.define :have_resource do |expected_resource|
-  match do |actual_catalog|
-    actual_catalog.resource(expected_resource)
-  end
-
-  def failure_message_for_should
-    "expected #{@actual.to_dot} to include #{@expected[0]}"
-  end
-end

data/spec/unit/transaction/event_spec.rb

@@ -149,7 +149,7 @@ describe Puppet::Transaction::Event do
         :property => :mode,
         :status => 'success')
 
-      tripped = Puppet::Transaction::Event.from_pson(PSON.parse(event.to_pson))
+      tripped = Puppet::Transaction::Event.from_data_hash(PSON.parse(event.to_pson))
 
       tripped.audited.should == event.audited
       tripped.property.should == event.property
@@ -176,7 +176,7 @@ describe Puppet::Transaction::Event do
         :property => :mode,
         :status => 'success')
 
-      tripped = Puppet::Transaction::Event.from_pson(PSON.parse(event.to_pson))
+      tripped = Puppet::Transaction::Event.from_data_hash(PSON.parse(event.to_pson))
 
       tripped.desired_value.should be_nil
       tripped.historical_value.should be_nil

data/spec/unit/transaction/report_spec.rb

@@ -3,22 +3,12 @@ require 'spec_helper'
 
 require 'puppet'
 require 'puppet/transaction/report'
-
-# the json-schema gem doesn't support windows
-if not Puppet.features.microsoft_windows?
-  REPORT_SCHEMA_URI = File.join(File.dirname(__FILE__),    '../../../api/schemas/report.json')
-  REPORT_SCHEMA = JSON.parse(File.read(REPORT_SCHEMA_URI))
-
-  describe "report schema" do
-    it "should validate against the json meta-schema" do
-      JSON::Validator.validate!(JSON_META_SCHEMA, REPORT_SCHEMA)
-    end
-  end
-
-end
+require 'matchers/json'
 
 describe Puppet::Transaction::Report do
+  include JSONMatchers
   include PuppetSpec::Files
+
   before do
     Puppet::Util::Storage.stubs(:store)
   end
@@ -405,10 +395,16 @@ describe Puppet::Transaction::Report do
     expect_equivalent_reports(tripped, report)
   end
 
-  it "generates pson which validates against the report schema", :unless => Puppet.features.microsoft_windows? do
+  it "generates pson which validates against the report schema" do
     Puppet[:report_serialization_format] = "pson"
     report = generate_report
-    JSON::Validator.validate!(REPORT_SCHEMA, report.render)
+    expect(report.render).to validate_against('api/schemas/report.json')
+  end
+
+  it "generates pson for error report which validates against the report schema" do
+    Puppet[:report_serialization_format] = "pson"
+    error_report = generate_report_with_error
+    expect(error_report.render).to validate_against('api/schemas/report.json')
   end
 
   it "can make a round trip through yaml" do
@@ -485,4 +481,17 @@ describe Puppet::Transaction::Report do
     report
   end
 
+  def generate_report_with_error
+    status = Puppet::Resource::Status.new(Puppet::Type.type(:notify).new(:title => "a resource"))
+    status.changed = true
+    status.failed_because("bad stuff happened")
+
+    report = Puppet::Transaction::Report.new('apply', 1357986, 'test_environment', "df34516e-4050-402d-a166-05b03b940749")
+    report << Puppet::Util::Log.new(:level => :warning, :message => "log message")
+    report.add_times("timing", 4)
+    report.add_resource_status(status)
+    report.finalize_report
+    report
+  end
+
 end

data/spec/unit/transaction/resource_harness_spec.rb

@@ -361,7 +361,7 @@ describe Puppet::Transaction::ResourceHarness do
       resource.expects(:err).never # make sure no exceptions get swallowed
       @harness.expects(:allow_changes?).with(resource).returns false
       status = @harness.evaluate(resource)
-      Puppet::FileSystem::File.exist?(test_file).should == false
+      Puppet::FileSystem.exist?(test_file).should == false
     end
   end
 

data/spec/unit/type/cron_spec.rb

@@ -3,12 +3,16 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:cron), :unless => Puppet.features.microsoft_windows? do
-  before do
+  before :all do
     @provider_class = described_class.provide(:simple) { mk_resource_methods }
     @provider_class.stubs(:suitable?).returns true
     described_class.stubs(:defaultprovider).returns @provider_class
   end
 
+  after :all do
+    described_class.unprovide(:simple)
+  end
+
   it "should have :name be its namevar" do
     described_class.key_attributes.should == [:name]
   end
@@ -441,6 +445,40 @@ describe Puppet::Type.type(:cron), :unless => Puppet.features.microsoft_windows?
       end
     end
 
+    describe "special" do
+      %w(reboot yearly annually monthly weekly daily midnight hourly).each do |value|
+        it "should support the value '#{value}'" do
+          expect { described_class.new(:name => 'foo', :special => value ) }.to_not raise_error(Puppet::Error, /cannot specify both a special schedule and a value/)
+        end
+      end
+
+      context "when combined with numeric schedule fields" do
+        context "which are 'absent'" do
+          [ %w(reboot yearly annually monthly weekly daily midnight hourly), :absent ].flatten.each { |value|
+            it "should accept the value '#{value}' for special" do
+              expect {
+                described_class.new(:name => 'foo', :minute => :absent, :special => value )
+              }.to_not raise_error(Puppet::Error, /cannot specify both a special schedule and a value/)
+            end
+          }
+        end
+        context "which are not absent" do
+          %w(reboot yearly annually monthly weekly daily midnight hourly).each { |value|
+            it "should not accept the value '#{value}' for special" do
+              expect {
+                described_class.new(:name => 'foo', :minute => "1", :special => value )
+              }.to raise_error(Puppet::Error, /cannot specify both a special schedule and a value/)
+            end
+          }
+          it "should accept the 'absent' value for special" do
+            expect {
+              described_class.new(:name => 'foo', :minute => "1", :special => :absent )
+            }.to_not raise_error(Puppet::Error, /cannot specify both a special schedule and a value/)
+          end
+        end
+      end
+    end
+
     describe "environment" do
       it "it should accept an :environment that looks like a path" do
         expect do

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

@@ -196,12 +196,13 @@ describe content do
           before do
             Puppet[:show_diff] = cfg
             @resource.stubs(:show_diff?).returns param
+            @resource[:loglevel] = "debug"
           end
 
           if cfg and param
             it "should display a diff" do
               @content.expects(:diff).returns("my diff").once
-              @content.expects(:notice).with("\nmy diff").once
+              @content.expects(:debug).with("\nmy diff").once
               @content.should_not be_safe_insync("other content")
             end
           else
@@ -336,10 +337,9 @@ describe content do
       end
 
       it "should copy content from the source to the file" do
-        dest_file = Puppet::FileSystem::File.new(@filename)
         @resource.write(@source)
 
-        dest_file.binread.should == @source_content
+        Puppet::FileSystem.binread(@filename).should == @source_content
       end
 
       it "should return the checksum computed" do
@@ -367,10 +367,9 @@ describe content do
       end
 
       it "should write the contents to the file" do
-        dest_file = Puppet::FileSystem::File.new(@filename)
         @resource.write(@source)
 
-        dest_file.binread.should == @source_content
+        Puppet::FileSystem.binread(@filename).should == @source_content
       end
 
       it "should not write anything if source is not found" do

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

@@ -16,7 +16,7 @@ describe Puppet::Type.type(:file).attrclass(:ctime) do
     @resource[:audit] = [:ctime]
 
     # this .to_resource audit behavior is magical :-(
-    @resource.to_resource[:ctime].should == Puppet::FileSystem::File.new(@filename).stat.ctime
+    @resource.to_resource[:ctime].should == Puppet::FileSystem.stat(@filename).ctime
   end
 
   it "should return absent if auditing an absent file" do

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

@@ -81,7 +81,7 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
     end
 
     it "should return true if the file is a link and we are managing links", :if => Puppet.features.manages_symlinks? do
-      Puppet::FileSystem::File.new('anything').symlink(path)
+      Puppet::FileSystem.symlink('anything', path)
 
       mode.must be_insync('644')
     end
@@ -185,10 +185,11 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
 
     it "changes only the requested bits" do
       # lower nibble must be set to 4 for the sake of passing on Windows
-      FileUtils.chmod 0464, path
+      Puppet::FileSystem.chmod(0464, path)
+
       mode_sym.sync
-      file = Puppet::FileSystem::File.new(path)
-      (file.stat.mode & 0777).to_s(8).should == "644"
+      stat = Puppet::FileSystem.stat(path)
+      (stat.mode & 0777).to_s(8).should == "644"
     end
   end
 end

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

@@ -16,7 +16,7 @@ describe Puppet::Type.type(:file).attrclass(:mtime) do
     @resource[:audit] = [:mtime]
 
     # this .to_resource audit behavior is magical :-(
-    @resource.to_resource[:mtime].should == Puppet::FileSystem::File.new(@filename).stat.mtime
+    @resource.to_resource[:mtime].should == Puppet::FileSystem.stat(@filename).mtime
   end
 
   it "should return absent if auditing an absent file" do

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

@@ -94,6 +94,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
     before do
       @metadata = stub 'metadata', :source= => nil
       @resource.stubs(:[]).with(:links).returns :manage
+      @resource.stubs(:[]).with(:source_permissions)
     end
 
     it "should return already-available metadata" do
@@ -109,22 +110,36 @@ 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 => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :environment => @environment, :links => :manage).returns @metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with do |uri, options|
+        expect(uri).to eq @foobar_uri
+        expect(options[:environment]).to eq @environment
+        expect(options[:links]).to eq :manage
+      end.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 => [@foobar, @feebooz])
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :environment => @environment, :links => :manage).returns nil
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@feebooz_uri, :environment => @environment, :links => :manage).returns metadata
+      options = {
+        :environment => @environment,
+        :links => :manage,
+        :source_permissions => nil
+      }
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, options).returns nil
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@feebooz_uri, options).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 => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :environment => @environment, :links => :manage).returns metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with do |uri, options|
+        expect(uri).to eq @foobar_uri
+        expect(options[:environment]).to eq @environment
+        expect(options[:links]).to eq :manage
+      end.returns metadata
 
       metadata.expects(:source=).with(@foobar_uri)
       @source.metadata
@@ -132,7 +147,11 @@ 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 => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :environment => @environment, :links => :manage).raises RuntimeError
+      Puppet::FileServing::Metadata.indirection.expects(:find).with do |uri, options|
+        expect(uri).to eq @foobar_uri
+        expect(options[:environment]).to eq @environment
+        expect(options[:links]).to eq :manage
+      end.raises RuntimeError
 
       @source.expects(:fail).raises ArgumentError
       lambda { @source.metadata }.should raise_error(ArgumentError)
@@ -140,7 +159,11 @@ 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 => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :environment => @environment, :links => :manage).returns nil
+      Puppet::FileServing::Metadata.indirection.expects(:find).with  do |uri, options|
+        expect(uri).to eq @foobar_uri
+        expect(options[:environment]).to eq @environment
+        expect(options[:links]).to eq :manage
+      end.returns nil
 
       @source.expects(:fail).raises RuntimeError
 
@@ -270,7 +293,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
         context "when managing an existing file" do
           before :each do
-            Puppet::FileSystem::File.stubs(:exist?).with(@resource[:path]).returns(true)
+            Puppet::FileSystem.stubs(:exist?).with(@resource[:path]).returns(true)
           end
 
           it "should not copy owner, group or mode from local sources" do

data/spec/unit/type/file_spec.rb

@@ -920,7 +920,7 @@ describe Puppet::Type.type(:file) do
 
       file.remove_existing(:directory).should == true
 
-      Puppet::FileSystem::File.exist?(file[:path]).should == false
+      Puppet::FileSystem.exist?(file[:path]).should == false
     end
 
     it "should remove an existing link", :if => described_class.defaultprovider.feature?(:manages_symlinks) do
@@ -928,12 +928,12 @@ describe Puppet::Type.type(:file) do
 
       target = tmpfile('link_target')
       FileUtils.touch(target)
-      Puppet::FileSystem::File.new(target).symlink(path)
+      Puppet::FileSystem.symlink(target, path)
       file[:target] = target
 
       file.remove_existing(:directory).should == true
 
-      Puppet::FileSystem::File.exist?(file[:path]).should == false
+      Puppet::FileSystem.exist?(file[:path]).should == false
     end
 
     it "should fail if the file is not a file, link, or directory" do
@@ -947,7 +947,7 @@ describe Puppet::Type.type(:file) do
       file.stat
       file.stubs(:stat).returns stub('stat', :ftype => 'file')
 
-      Puppet::FileSystem::File.stubs(:unlink)
+      Puppet::FileSystem.stubs(:unlink)
 
       file.remove_existing(:directory).should == true
       file.instance_variable_get(:@stat).should == :needs_stat
@@ -1009,7 +1009,7 @@ describe Puppet::Type.type(:file) do
     before do
       target = tmpfile('link_target')
       FileUtils.touch(target)
-      Puppet::FileSystem::File.new(target).symlink(path)
+      Puppet::FileSystem.symlink(target, path)
 
       file[:target] = target
       file[:links] = :manage # so we always use :lstat
@@ -1373,7 +1373,7 @@ describe Puppet::Type.type(:file) do
       catalog.apply
 
       # I convert them to strings so they display correctly if there's an error.
-      (Puppet::FileSystem::File.new(@target).stat.mode & 007777).to_s(8).should == '644'
+      (Puppet::FileSystem.stat(@target).mode & 007777).to_s(8).should == '644'
     end
 
     it "should manage the mode of the followed link" do
@@ -1382,7 +1382,7 @@ describe Puppet::Type.type(:file) do
         @link_resource[:links] = :follow
         catalog.apply
 
-        (Puppet::FileSystem::File.new(@target).stat.mode & 007777).to_s(8).should == '755'
+        (Puppet::FileSystem.stat(@target).mode & 007777).to_s(8).should == '755'
       end
     end
   end
@@ -1466,7 +1466,7 @@ describe Puppet::Type.type(:file) do
 
       catalog.apply
 
-      Puppet::FileSystem::File.exist?(path).should be_true
+      Puppet::FileSystem.exist?(path).should be_true
       @logs.should_not be_any {|l| l.level != :notice }
     end
   end