puppet 3.4.3 → 3.5.0.rc1

data/spec/unit/util/docs_spec.rb

@@ -85,6 +85,15 @@ EOT
       expect(Puppet::Util::Docs.scrub(my_cleaned_output)).to eq my_cleaned_output
     end
 
+    it "trims leading space from one-liners (even when they're buffered with extra newlines)" do
+      input = "
+        Updates values in the `puppet.conf` configuration file.
+      "
+      expected_output = "Updates values in the `puppet.conf` configuration file."
+      output = Puppet::Util::Docs.scrub(input)
+      expect(output).to eq expected_output
+    end
+
 
   end
 end

data/spec/unit/util/execution_spec.rb

@@ -529,7 +529,7 @@ describe Puppet::Util::Execution do
 
         Puppet::Util::Execution.execute('test command')
 
-        Puppet::FileSystem::File.exist?(path).should be_false
+        Puppet::FileSystem.exist?(path).should be_false
       end
 
       it "should not raise an error if the file is open" do

data/spec/unit/util/filetype_spec.rb

@@ -16,15 +16,15 @@ describe Puppet::Util::FileType do
 
     describe "when the file already exists" do
       it "should return the file's contents when asked to read it" do
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns true
+        Puppet::FileSystem.expects(:exist?).with(path).returns true
         File.expects(:read).with(path).returns "my text"
 
         file.read.should == "my text"
       end
 
       it "should unlink the file when asked to remove it" do
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns true
-        Puppet::FileSystem::File.expects(:unlink).with(path)
+        Puppet::FileSystem.expects(:exist?).with(path).returns true
+        Puppet::FileSystem.expects(:unlink).with(path)
 
         file.remove
       end
@@ -32,7 +32,7 @@ describe Puppet::Util::FileType do
 
     describe "when the file does not exist" do
       it "should return an empty string when asked to read the file" do
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns false
+        Puppet::FileSystem.expects(:exist?).with(path).returns false
 
         file.read.should == ""
       end
@@ -63,13 +63,13 @@ describe Puppet::Util::FileType do
 
     describe "when backing up a file" do
       it "should do nothing if the file does not exist" do
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns false
+        Puppet::FileSystem.expects(:exist?).with(path).returns false
         file.expects(:bucket).never
         file.backup
       end
 
       it "should use its filebucket to backup the file if it exists" do
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns true
+        Puppet::FileSystem.expects(:exist?).with(path).returns true
 
         bucket = mock 'bucket'
         bucket.expects(:backup).with(path)
@@ -155,7 +155,7 @@ describe Puppet::Util::FileType do
       end
 
       after :each do
-        Puppet::FileSystem::File.exist?(@tmp_cron_path).should be_false
+        Puppet::FileSystem.exist?(@tmp_cron_path).should be_false
       end
 
       it "should run crontab as the target user on a temporary file" do

data/spec/unit/util/instrumentation/data_spec.rb

@@ -6,6 +6,8 @@ require 'puppet/util/instrumentation'
 require 'puppet/util/instrumentation/data'
 
 describe Puppet::Util::Instrumentation::Data do
+  include JSONMatchers
+
   Puppet::Util::Instrumentation::Data
 
   before(:each) do
@@ -39,6 +41,6 @@ describe Puppet::Util::Instrumentation::Data do
   end
 
   it "should return a hash containing data when unserializing from pson" do
-    Puppet::Util::Instrumentation::Data.from_pson({:name => "name"}).should == {:name => "name"}
+    Puppet::Util::Instrumentation::Data.from_data_hash({:name => "name"}).should == {:name => "name"}
   end
 end

data/spec/unit/util/instrumentation/indirection_probe_spec.rb

@@ -6,6 +6,8 @@ require 'puppet/util/instrumentation'
 require 'puppet/util/instrumentation/indirection_probe'
 
 describe Puppet::Util::Instrumentation::IndirectionProbe do
+  include JSONMatchers
+
   Puppet::Util::Instrumentation::IndirectionProbe
 
   it "should indirect instrumentation_probe" do

data/spec/unit/util/instrumentation/listener_spec.rb

@@ -7,6 +7,7 @@ require 'puppet/util/instrumentation'
 require 'puppet/util/instrumentation/listener'
 
 describe Puppet::Util::Instrumentation::Listener do
+  include JSONMatchers
 
   Listener = Puppet::Util::Instrumentation::Listener
 
@@ -87,14 +88,14 @@ describe Puppet::Util::Instrumentation::Listener do
   describe "when deserializing from pson" do
     it "should lookup the archetype listener from the instrumentation layer" do
       Puppet::Util::Instrumentation.expects(:[]).with("listener").returns(@listener)
-      Puppet::Util::Instrumentation::Listener.from_pson({"name" => "listener"})
+      Puppet::Util::Instrumentation::Listener.from_data_hash({"name" => "listener"})
     end
 
     it "should create a new listener shell instance delegating to the archetypal listener" do
       Puppet::Util::Instrumentation.expects(:[]).with("listener").returns(@listener)
       @listener.stubs(:listener).returns(@delegate)
       Puppet::Util::Instrumentation::Listener.expects(:new).with(@delegate, nil, true)
-      Puppet::Util::Instrumentation::Listener.from_pson({"name" => "listener", "enabled" => true})
+      Puppet::Util::Instrumentation::Listener.from_data_hash({"name" => "listener", "enabled" => true})
     end
   end
 end

data/spec/unit/util/json_lockfile_spec.rb

@@ -21,9 +21,30 @@ describe Puppet::Util::JsonLockfile do
     end
   end
 
-  it "should return the lock data" do
-    data = { "foo" => "foofoo", "bar" => "barbar" }
-    @lock.lock(data)
-    @lock.lock_data.should == data
+  describe "reading lock data" do
+    it "returns deserialized JSON from the lockfile" do
+      data = { "foo" => "foofoo", "bar" => "barbar" }
+      @lock.lock(data)
+      expect(@lock.lock_data).to eq data
+    end
+
+    it "returns nil if the file read returned nil" do
+      @lock.lock
+      File.stubs(:read).returns nil
+      expect(@lock.lock_data).to be_nil
+    end
+
+    it "returns nil if the file was empty" do
+      @lock.lock
+      File.stubs(:read).returns ''
+      expect(@lock.lock_data).to be_nil
+    end
+
+    it "returns nil if the file was not in PSON" do
+      @lock.lock
+      File.stubs(:read).returns ']['
+      expect(@lock.lock_data).to be_nil
+    end
+
   end
 end

data/spec/unit/util/lockfile_spec.rb

@@ -3,6 +3,33 @@ require 'spec_helper'
 
 require 'puppet/util/lockfile'
 
+module LockfileSpecHelper
+  def self.run_in_forks(count, &blk)
+    forks = {}
+    results = []
+    count.times do |i|
+      forks[i] = {}
+      forks[i][:read], forks[i][:write] = IO.pipe
+
+      forks[i][:pid] = fork do
+        forks[i][:read].close
+        res = yield
+        Marshal.dump(res, forks[i][:write])
+        exit!
+      end
+    end
+
+    count.times do |i|
+      forks[i][:write].close
+      result = forks[i][:read].read
+      forks[i][:read].close
+      Process.wait2(forks[i][:pid])
+      results << Marshal.load(result)
+    end
+    results
+  end
+end
+
 describe Puppet::Util::Lockfile do
   require 'puppet_spec/files'
   include PuppetSpec::Files
@@ -13,19 +40,34 @@ describe Puppet::Util::Lockfile do
   end
 
   describe "#lock" do
-    it "should return false if already locked" do
-      @lock.stubs(:locked?).returns(true)
-      @lock.lock.should be_false
-    end
-
     it "should return true if it successfully locked" do
       @lock.lock.should be_true
     end
 
+    it "should return false if already locked" do
+      @lock.lock
+      @lock.lock.should be_false
+    end
+
     it "should create a lock file" do
       @lock.lock
 
-      Puppet::FileSystem::File.exist?(@lockfile).should be_true
+      Puppet::FileSystem.exist?(@lockfile).should be_true
+    end
+
+    # We test simultaneous locks using fork which isn't supported on Windows.
+    it "should not be acquired by another process", :unless => Puppet.features.microsoft_windows? do
+      30.times do
+        forks = 3
+        results = LockfileSpecHelper.run_in_forks(forks) do
+          @lock.lock(Process.pid)
+        end
+        @lock.unlock
+
+        # Confirm one fork returned true and everyone else false.
+        (results - [true]).size.should == forks - 1
+        (results - [false]).size.should == 1
+      end
     end
 
     it "should create a lock file containing a string" do
@@ -49,7 +91,7 @@ describe Puppet::Util::Lockfile do
     it "should clear the lock file" do
       File.open(@lockfile, 'w') { |fd| fd.print("locked") }
       @lock.unlock
-      Puppet::FileSystem::File.exist?(@lockfile).should be_false
+      Puppet::FileSystem.exist?(@lockfile).should be_false
     end
   end
 

data/spec/unit/util/log/destinations_spec.rb

@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
+require 'json'
 
 require 'puppet/util/log'
 

data/spec/unit/util/log_spec.rb

@@ -365,7 +365,7 @@ describe Puppet::Util::Log do
 
   it "should round trip through pson" do
     log = Puppet::Util::Log.new(:level => 'notice', :message => 'hooray', :file => 'thefile', :line => 1729, :source => 'specs', :tags => ['a', 'b', 'c'])
-    tripped = Puppet::Util::Log.from_pson(PSON.parse(log.to_pson))
+    tripped = Puppet::Util::Log.from_data_hash(PSON.parse(log.to_pson))
 
     tripped.file.should == log.file
     tripped.line.should == log.line

data/spec/unit/util/metric_spec.rb

@@ -89,7 +89,7 @@ describe Puppet::Util::Metric do
     metric.newvalue("v1", 10.1, "something")
     metric.newvalue("v2", 20, "something else")
 
-    tripped = Puppet::Util::Metric.from_pson(PSON.parse(metric.to_pson))
+    tripped = Puppet::Util::Metric.from_data_hash(PSON.parse(metric.to_pson))
 
     tripped.name.should == metric.name
     tripped.label.should == metric.label

data/spec/unit/util/pidlock_spec.rb

@@ -47,7 +47,7 @@ describe Puppet::Util::Pidlock do
 
     it "should create a lock file" do
       @lock.lock
-      Puppet::FileSystem::File.exist?(@lockfile).should be_true
+      Puppet::FileSystem.exist?(@lockfile).should be_true
     end
 
     it "should expose the lock file_path" do
@@ -74,7 +74,7 @@ describe Puppet::Util::Pidlock do
     it "should get rid of the lock file" do
       @lock.lock
       @lock.unlock
-      Puppet::FileSystem::File.exist?(@lockfile).should be_false
+      Puppet::FileSystem.exist?(@lockfile).should be_false
     end
   end
 
@@ -106,12 +106,12 @@ describe Puppet::Util::Pidlock do
     describe "#lock" do
       it "should clear stale locks" do
         @lock.locked?
-        Puppet::FileSystem::File.exist?(@lockfile).should be_false
+        Puppet::FileSystem.exist?(@lockfile).should be_false
       end
 
       it "should replace with new locks" do
         @lock.lock
-        Puppet::FileSystem::File.exist?(@lockfile).should be_true
+        Puppet::FileSystem.exist?(@lockfile).should be_true
         @lock.lock_pid.should == 6789
         @lock.should be_mine
         @lock.should be_locked
@@ -125,7 +125,7 @@ describe Puppet::Util::Pidlock do
 
       it "should not remove the lock file" do
         @lock.unlock
-        Puppet::FileSystem::File.exist?(@lockfile).should be_true
+        Puppet::FileSystem.exist?(@lockfile).should be_true
       end
     end
   end
@@ -170,7 +170,7 @@ describe Puppet::Util::Pidlock do
 
       it "should not remove the lock file" do
         @lock.unlock
-        Puppet::FileSystem::File.exist?(@lockfile).should be_true
+        Puppet::FileSystem.exist?(@lockfile).should be_true
       end
 
       it "should still not be our lock" do

data/spec/unit/util/pson_spec.rb

@@ -15,9 +15,9 @@ describe Puppet::Util::Pson do
     }.to raise_error(ArgumentError, /No data provided in pson data/)
   end
 
-  it "should call 'from_pson' with the provided data" do
+  it "should call 'from_data_hash' with the provided data" do
     pson = PsonUtil.new
-    pson.expects(:from_pson).with("mydata")
+    pson.expects(:from_data_hash).with("mydata")
     pson.pson_create("type" => "foo", "data" => "mydata")
   end
 

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

@@ -15,7 +15,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
   before :each do
     stub_file = stub('init.pp', :stat => stub())
     # Ruby 1.8.7 needs the following call to be stubs and not expects
-    Puppet::FileSystem::File.stubs(:new).with('init.pp').returns stub_file
+    Puppet::FileSystem.stubs(:stat).with('init.pp').returns stub() # stub_file
     @top_level = stub_everything 'toplevel', :file_relative_name => "init.pp"
     @parser = RDoc::Parser.new(@top_level, "module/manifests/init.pp", nil, Options.instance, RDoc::Stats.new)
   end
@@ -27,7 +27,9 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       Puppet::Parser::Parser.stubs(:new).returns(parser)
       parser.expects(:parse).returns(Puppet::Parser::AST::Hostclass.new('')).at_least_once
       parser.expects(:file=).with("module/manifests/init.pp")
-      parser.expects(:file=).with(File.expand_path("/dev/null/manifests/site.pp"))
+      parser.expects(:file=).with do |args|
+        args =~ /.*\/etc\/manifests\/site.pp/
+      end
 
       @parser.scan
     end
@@ -66,9 +68,11 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
   end
 
   describe "when scanning top level entities" do
+    let(:environment) { Puppet::Node::Environment.create(:env, [], '') }
+
     before :each do
       @resource_type_collection = resource_type_collection = stub_everything('resource_type_collection')
-      @parser.instance_eval { @known_resource_types = resource_type_collection }
+      environment.stubs(:known_resource_types).returns(@resource_type_collection)
       @parser.stubs(:split_module).returns("module")
 
       @topcontainer = stub_everything 'topcontainer'
@@ -86,7 +90,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @module.expects(:add_comment).with("readme", "module/manifests/init.pp")
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should read any present README.rdoc as module documentation" do
@@ -97,7 +101,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @module.expects(:add_comment).with("readme", "module/manifests/init.pp")
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should prefer README.rdoc over README as module documentation" do
@@ -109,7 +113,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @module.expects(:add_comment).with("readme.rdoc", "module/manifests/init.pp")
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should tell the container its module name" do
@@ -117,7 +121,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @topcontainer.expects(:module_name=).with("module")
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should not document our toplevel if it isn't a valid module" do
@@ -126,7 +130,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       @topcontainer.expects(:document_self=).with(false)
       @parser.expects(:parse_elements).never
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should set the module as global if we parse the global manifests (ie __site__ module)" do
@@ -135,7 +139,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @topcontainer.expects(:global=).with(true)
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should attach this module container to the toplevel container" do
@@ -143,13 +147,13 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @container.expects(:add_module).with(RDoc::PuppetModule, "module").returns(@module)
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should defer ast parsing to parse_elements for this module" do
-      @parser.expects(:parse_elements).with(@module)
+      @parser.expects(:parse_elements).with(@module, @resource_type_collection)
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
 
     it "should defer plugins parsing to parse_plugins for this module" do
@@ -157,29 +161,28 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:parse_plugins).with(@module)
 
-      @parser.scan_top_level(@topcontainer)
+      @parser.scan_top_level(@topcontainer, environment)
     end
   end
 
   describe "when finding modules from filepath" do
-    before :each do
-      Puppet::Node::Environment.any_instance.stubs(:modulepath).returns("/path/to/modules")
-    end
+    let(:environment) {
+      Puppet::FileSystem.expects(:directory?).with("/path/to/modules").at_least_once.returns(true)
+      Puppet::Node::Environment.create(:env, ["/path/to/modules"], '')
+    }
 
     it "should return the module name for modulized puppet manifests" do
-      File.stubs(:expand_path).returns("/path/to/module/manifests/init.pp")
-      File.stubs(:identical?).with("/path/to", "/path/to/modules").returns(true)
-      @parser.split_module("/path/to/modules/mymodule/manifests/init.pp").should == "module"
+      File.stubs(:identical?).with("/path/to/modules", "/path/to/modules").returns(true)
+      @parser.split_module("/path/to/modules/mymodule/manifests/init.pp", environment).should == "mymodule"
     end
 
     it "should return <site> for manifests not under module path" do
-      File.stubs(:expand_path).returns("/path/to/manifests/init.pp")
       File.stubs(:identical?).returns(false)
-      @parser.split_module("/path/to/manifests/init.pp").should == RDoc::Parser::SITE
+      @parser.split_module("/path/to/manifests/init.pp", environment).should == RDoc::Parser::SITE
     end
 
     it "should handle windows paths with drive letters", :if => Puppet.features.microsoft_windows? && Puppet.features.rdoc1? do
-      @parser.split_module("C:/temp/init.pp").should == RDoc::Parser::SITE
+      @parser.split_module("C:/temp/init.pp", environment).should == RDoc::Parser::SITE
     end
   end
 
@@ -200,7 +203,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:document_class).with("myclass", @klass, @container)
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
 
     it "should not document class parsed in an other file" do
@@ -209,7 +212,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:document_class).with("myclass", @klass, @container).never
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
 
     it "should document vardefs for the main class" do
@@ -222,7 +225,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:scan_for_vardef).with(@container, code)
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
 
     it "should document definitions in the parsed file" do
@@ -230,7 +233,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:document_define).with("mydef", @definition, @container)
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
 
     it "should not document definitions parsed in an other file" do
@@ -239,7 +242,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:document_define).with("mydef", @definition, @container).never
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
 
     it "should document nodes in the parsed file" do
@@ -247,7 +250,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:document_node).with("mynode", @node, @container)
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
 
     it "should not document node parsed in an other file" do
@@ -256,7 +259,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
 
       @parser.expects(:document_node).with("mynode", @node, @container).never
 
-      @parser.parse_elements(@container)
+      @parser.parse_elements(@container, @resource_type_collection)
     end
   end