puppet 3.4.3 → 3.5.0.rc1

data/spec/lib/matchers/match_tokens2.rb

@@ -0,0 +1,74 @@
+# Matches tokens produced by lexer
+# The given exepected is one or more entries where an entry is one of
+# - a token symbol
+# - an Array with a token symbol and the text value
+# - an Array with a token symbol and a Hash specifying all attributes of the token
+# - nil (ignore)
+#
+RSpec::Matchers.define :match_tokens2 do | *expected |
+  match do | actual |
+    expected.zip(actual).all? do |e, a|
+      compare(e, a)
+    end
+  end
+
+  def failure_message_for_should
+    msg = ["Expected (#{expected.size}):"]
+    expected.each {|e| msg << e.to_s }
+
+    zipped = expected.zip(actual)
+    msg << "\nGot (#{actual.size}):"
+    actual.each_with_index do |e, idx|
+      if zipped[idx]
+        zipped_expected = zipped[idx][0]
+        zipped_actual = zipped[idx][1]
+
+        prefix = compare(zipped_expected, zipped_actual) ? ' ' : '*'
+        msg2 = ["#{prefix}[:"]
+        msg2 << e[0].to_s
+        msg2 << ', '
+        if e[1] == false
+          msg2 << 'false'
+        else
+          msg2 << e[1][:value].to_s.dump
+        end
+        # If expectation has options, output them
+        if zipped_expected.is_a?(Array) && zipped_expected[2] && zipped_expected[2].is_a?(Hash)
+          msg2 << ", {"
+          msg3 = []
+          zipped_expected[2].each do |k,v|
+            prefix = e[1][k] != v ? "*" : ''
+            msg3 << "#{prefix}:#{k}=>#{e[1][k]}"
+          end
+          msg2 << msg3.join(", ")
+          msg2 << "}"
+        end
+        msg2 << ']'
+        msg << msg2.join('')
+      end
+    end
+    msg.join("\n")
+  end
+
+  def compare(e, a)
+    # if expected ends before actual
+    return true if !e
+
+    # If actual ends before expected
+    return false if !a
+
+    # Simple - only expect token to match
+    return true if a[0] == e
+
+    # Expect value and optional attributes to match
+    if e.is_a? Array
+      # tokens must match
+      return false unless a[0] == e[0]
+      if e[2].is_a?(Hash)
+        e[2].each {|k,v| return false unless a[1][k] == v }
+      end
+      return (a[1] == e[1] || (a[1][:value] == e[1]))
+    end
+    false
+  end
+end

data/spec/lib/matchers/resource.rb

@@ -0,0 +1,35 @@
+module Matchers; module Resource
+  extend RSpec::Matchers::DSL
+
+  matcher :have_resource do |expected_resource|
+    @params = {}
+
+    match do |actual_catalog|
+      @mismatch = ""
+      if resource = actual_catalog.resource(expected_resource)
+        matched = true
+        failures = []
+        @params.each do |name, value|
+          if resource[name] != value
+            matched = false
+            failures << "expected #{name} to be '#{value}' but was '#{resource[name]}'"
+          end
+        end
+        @mismatch = failures.join("\n")
+
+        matched
+      else
+        @mismatch = "expected #{@actual.to_dot} to include #{@expected[0]}"
+        false
+      end
+    end
+
+    chain :with_parameter do |name, value|
+      @params[name] = value
+    end
+
+    def failure_message_for_should
+      @mismatch
+    end
+  end
+end; end

data/spec/lib/puppet/indirector/indirector_testing/memory.rb

@@ -0,0 +1,7 @@
+require 'puppet/indirector/memory'
+
+class Puppet::IndirectorTesting::Memory < Puppet::Indirector::Memory
+  def supports_remote_requests?
+    true
+  end
+end

data/spec/lib/puppet/indirector/indirector_testing/msgpack.rb

@@ -0,0 +1,6 @@
+require 'puppet/indirector_testing'
+require 'puppet/indirector/msgpack'
+
+class Puppet::IndirectorTesting::Msgpack < Puppet::Indirector::Msgpack
+  desc "Testing the MessagePack indirector"
+end

data/spec/lib/puppet/indirector_testing.rb

@@ -8,19 +8,29 @@ class Puppet::IndirectorTesting
   # We should have some way to identify if we got a valid object back with the
   # current values, no?
   attr_accessor :value
+  alias_method :name, :value
+  alias_method :name=, :value=
   def initialize(value)
     self.value = value
   end
 
+  def self.from_raw(raw)
+    new(raw)
+  end
+
   PSON.register_document_type('IndirectorTesting',self)
-  def self.from_pson(data)
+  def self.from_data_hash(data)
     new(data['value'])
   end
 
+  def to_data_hash
+    { 'value' => value }
+  end
+
   def to_pson
     {
       'document_type' => 'IndirectorTesting',
-      'data'          => { 'value' => value },
+      'data'          => self.to_data_hash,
       'metadata'      => { 'api_version' => 1 }
     }.to_pson
   end

data/spec/lib/puppet_spec/files.rb

@@ -9,6 +9,7 @@ module PuppetSpec::Files
     $global_tempfiles ||= []
     while path = $global_tempfiles.pop do
       begin
+        Dir.unstub(:entries)
         FileUtils.rm_rf path, :secure => true
       rescue Errno::ENOENT
         # nothing to do

data/spec/lib/puppet_spec/matchers.rb

@@ -59,6 +59,7 @@ class HavePrintedMatcher
   def matches?(block)
     begin
       $stderr = $stdout = StringIO.new
+      $stdout.set_encoding('UTF-8') if $stdout.respond_to?(:set_encoding)
       block.call
       $stdout.rewind
       @actual = $stdout.read
@@ -87,6 +88,10 @@ class HavePrintedMatcher
     end
   end
 
+  def failure_message_for_should_not
+    "expected #{@expected.inspect} to not be printed; got:\n#{@actual}"
+  end
+
   def description
     "expect #{@expected.inspect} to be printed"
   end

data/spec/lib/puppet_spec/modules.rb

@@ -4,7 +4,7 @@ module PuppetSpec::Modules
       module_dir = File.join(dir, name)
       FileUtils.mkdir_p(module_dir)
 
-      environment = Puppet::Node::Environment.new(options[:environment])
+      environment = options[:environment]
 
       if metadata = options[:metadata]
         metadata[:source]  ||= 'github'

data/spec/lib/puppet_spec/scope.rb

@@ -0,0 +1,14 @@
+
+module PuppetSpec::Scope
+  # Initialize a new scope suitable for testing.
+  #
+  def create_test_scope_for_node(node_name)
+    node = Puppet::Node.new(node_name)
+    compiler = Puppet::Parser::Compiler.new(node)
+    scope = Puppet::Parser::Scope.new(compiler)
+    scope.source = Puppet::Resource::Type.new(:node, node_name)
+    scope.parent = compiler.topscope
+    scope
+  end
+
+end

data/spec/shared_behaviours/file_server_terminus.rb

@@ -4,8 +4,8 @@ shared_examples_for "Puppet::Indirector::FileServerTerminus" do
   # the 'before' block in the including context.
   before do
     Puppet::FileServing::Configuration.instance_variable_set(:@configuration, nil)
-    Puppet::FileSystem::File.stubs(:exist?).returns true
-    Puppet::FileSystem::File.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
+    Puppet::FileSystem.stubs(:exist?).returns true
+    Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
 
     @path = Tempfile.new("file_server_testing")
     path = @path.path

data/spec/spec_helper.rb

@@ -43,18 +43,6 @@ Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
   require behaviour.relative_path_from(Pathname.new(dir))
 end
 
-# various spec tests now use json schema validation
-# the json-schema gem doesn't support windows
-if not Puppet.features.microsoft_windows?
-  require 'json'
-  require 'json-schema'
-
-  JSON_META_SCHEMA = JSON.parse(File.read(File.join(File.dirname(__FILE__), '../api/schemas/json-meta-schema.json')))
-
-  # FACTS_SCHEMA is shared across two spec files so promote constant to here
-  FACTS_SCHEMA = JSON.parse(File.read(File.join(File.dirname(__FILE__), '../api/schemas/facts.json')))
-end
-
 RSpec.configure do |config|
   include PuppetSpec::Fixtures
 
@@ -67,7 +55,9 @@ RSpec.configure do |config|
   #    IPAddr.new("::2:3:4:5:6:7:8")
   #  end
   # end
-  config.filter_run_excluding :broken => true
+  exclude_filters = {:broken => true}
+  exclude_filters[:benchmark] = true unless ENV['BENCHMARK']
+  config.filter_run_excluding exclude_filters
 
   config.mock_with :mocha
 
@@ -90,9 +80,22 @@ RSpec.configure do |config|
 
   config.before :all do
     Puppet::Test::TestHelper.before_all_tests()
+    if ENV['PROFILE'] == 'all'
+      require 'ruby-prof'
+      RubyProf.start
+    end
   end
 
   config.after :all do
+    if ENV['PROFILE'] == 'all'
+      require 'ruby-prof'
+      result = RubyProf.stop
+      printer = RubyProf::CallTreePrinter.new(result)
+      open(File.join(ENV['PROFILEOUT'],"callgrind.all.#{Time.now.to_i}.trace"), "w") do |f|
+        printer.print(f)
+      end
+    end
+
     Puppet::Test::TestHelper.after_all_tests()
   end
 
@@ -122,8 +125,14 @@ RSpec.configure do |config|
 
     @log_level = Puppet::Util::Log.level
 
-    Puppet::Test::TestHelper.before_each_test()
+    base = PuppetSpec::Files.tmpdir('tmp_settings')
+    Puppet[:vardir] = File.join(base, 'var')
+    Puppet[:confdir] = File.join(base, 'etc')
+    Puppet[:logdir] = "$vardir/log"
+    Puppet[:rundir] = "$vardir/run"
+    Puppet[:hiera_config] = File.join(base, 'hiera')
 
+    Puppet::Test::TestHelper.before_each_test()
   end
 
   config.after :each do
@@ -155,9 +164,30 @@ RSpec.configure do |config|
         config.instance_variable_get(:@files_to_run).each { |f| logfile.puts f }
       end
     end
-    # Clean up switch of TMPDIR, don't know if needed after this, so needs to reset it
-    # to old before removing it
+
+    # return to original tmpdir
     ENV['TMPDIR'] = oldtmpdir
-    FileUtils.rm_rf(tmpdir) if Puppet::FileSystem::File.exist?(tmpdir) && tmpdir.to_s.start_with?(oldtmpdir)
+    FileUtils.rm_rf(tmpdir)
+  end
+
+  if ENV['PROFILE']
+    require 'ruby-prof'
+
+    def profile
+      result = RubyProf.profile { yield }
+      name = example.metadata[:full_description].downcase.gsub(/[^a-z0-9_-]/, "-").gsub(/-+/, "-")
+      printer = RubyProf::CallTreePrinter.new(result)
+      open(File.join(ENV['PROFILEOUT'],"callgrind.#{name}.#{Time.now.to_i}.trace"), "w") do |f|
+        printer.print(f)
+      end
+    end
+
+    config.around(:each) do |example|
+      if ENV['PROFILE'] == 'each' or (example.metadata[:profile] and ENV['PROFILE'])
+        profile { example.run }
+      else
+        example.run
+      end
+    end
   end
 end

data/spec/unit/agent_spec.rb

@@ -169,7 +169,7 @@ describe Puppet::Agent do
       @agent.run.should == :result
     end
 
-    describe "when should_fork is true" do
+    describe "when should_fork is true", :as_platform => :posix do
       before do
         @agent = Puppet::Agent.new(AgentTestClient, true)
 
@@ -225,6 +225,13 @@ describe Puppet::Agent do
         }
       end
     end
+
+    describe "on Windows", :as_platform => :windows do
+      it "should never fork" do
+        agent = Puppet::Agent.new(AgentTestClient, true)
+        expect(agent.should_fork).to be_false
+      end
+    end
   end
 
   describe "when splaying" do

data/spec/unit/application/agent_spec.rb

@@ -33,6 +33,8 @@ describe Puppet::Application::Agent do
     Puppet::Node::Facts.indirection.stubs(:terminus_class=)
 
     $stderr.expects(:puts).never
+
+    Puppet.settings.stubs(:use)
   end
 
   it "should operate in agent run_mode" do
@@ -198,7 +200,6 @@ describe Puppet::Application::Agent do
   describe "during setup" do
     before :each do
       Puppet.stubs(:info)
-      Puppet::FileSystem::File.stubs(:exist?).returns(true)
       Puppet[:libdir] = "/dev/null/lib"
       Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
       Puppet::Transaction::Report.indirection.stubs(:cache_class=)
@@ -291,6 +292,7 @@ describe Puppet::Application::Agent do
     end
 
     it "should use :main, :puppetd, and :ssl" do
+      Puppet.settings.unstub(:use)
       Puppet.settings.expects(:use).with(:main, :agent, :ssl)
 
       @puppetd.setup
@@ -449,8 +451,7 @@ describe Puppet::Application::Agent do
 
     describe "when setting up listen" do
       before :each do
-        Puppet::FileSystem::File.stubs(:exist?).with('auth').returns(true)
-        Puppet::FileSystem::File.stubs(:exist?).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(Puppet[:rest_authconfig]).returns(true)
         @puppetd.options[:serve] = []
         @server = stub_everything 'server'
         Puppet::Network::Server.stubs(:new).returns(@server)
@@ -460,7 +461,7 @@ describe Puppet::Application::Agent do
       it "should exit if no authorization file" do
         Puppet[:listen] = true
         Puppet.stubs(:err)
-        Puppet::FileSystem::File.stubs(:exist?).with(Puppet[:rest_authconfig]).returns(false)
+        Puppet::FileSystem.stubs(:exist?).with(Puppet[:rest_authconfig]).returns(false)
 
         expect do
           execute_agent

data/spec/unit/application/apply_spec.rb

@@ -21,7 +21,7 @@ describe Puppet::Application::Apply do
     Puppet::Node.indirection.cache_class = nil
   end
 
-  [:debug,:loadclasses,:verbose,:use_nodes,:detailed_exitcodes,:catalog, :write_catalog_summary].each do |option|
+  [:debug,:loadclasses,:test,:verbose,:use_nodes,:detailed_exitcodes,:catalog, :write_catalog_summary].each do |option|
     it "should declare handle_#{option} method" do
       @apply.should respond_to("handle_#{option}".to_sym)
     end
@@ -58,8 +58,31 @@ describe Puppet::Application::Apply do
       Puppet::FileBucket::Dipper.stubs(:new)
       STDIN.stubs(:read)
       Puppet::Transaction::Report.indirection.stubs(:cache_class=)
+    end
+
+    describe "with --test" do
+      it "should call setup_test" do
+        @apply.options[:test] = true
+        @apply.expects(:setup_test)
+
+        @apply.setup
+      end
+
+      it "should set options[:verbose] to true" do
+        @apply.setup_test
 
-      @apply.options.stubs(:[]).with(any_parameters)
+        @apply.options[:verbose].should == true
+      end
+      it "should set options[:show_diff] to true" do
+        Puppet.settings.override_default(:show_diff, false)
+        @apply.setup_test
+        Puppet[:show_diff].should == true
+      end
+      it "should set options[:detailed_exitcodes] to true" do
+        @apply.setup_test
+
+        @apply.options[:detailed_exitcodes].should == true
+      end
     end
 
     it "should set console as the log destination if logdest option wasn't provided" do
@@ -75,13 +98,13 @@ describe Puppet::Application::Apply do
     end
 
     it "should set log level to debug if --debug was passed" do
-      @apply.options.stubs(:[]).with(:debug).returns(true)
+      @apply.options[:debug] = true
       @apply.setup
       Puppet::Log.level.should == :debug
     end
 
     it "should set log level to info if --verbose was passed" do
-      @apply.options.stubs(:[]).with(:verbose).returns(true)
+      @apply.options[:verbose] = true
       @apply.setup
       Puppet::Log.level.should == :info
     end
@@ -176,6 +199,13 @@ describe Puppet::Application::Apply do
         Puppet::Node::Facts.indirection.cache_class = nil
       end
 
+      around :each do |example|
+        Puppet.override(:current_environment =>
+                        Puppet::Node::Environment.create(:production, [], '')) do
+          example.run
+        end
+      end
+
       it "should set the code to run from --code" do
         @apply.options[:code] = "code to run"
         Puppet.expects(:[]=).with(:code,"code to run")
@@ -192,16 +222,6 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
       end
 
-      it "should set the manifest if a file is passed on command line and the file exists" do
-        manifest = tmpfile('site.pp')
-        FileUtils.touch(manifest)
-        @apply.command_line.stubs(:args).returns([manifest])
-
-        Puppet.expects(:[]=).with(:manifest,manifest)
-
-        expect { @apply.main }.to exit_with 0
-      end
-
       it "should raise an error if a file is passed on command line and the file does not exist" do
         noexist = tmpfile('noexist.pp')
         @apply.command_line.stubs(:args).returns([noexist])
@@ -214,7 +234,6 @@ describe Puppet::Application::Apply do
 
         @apply.command_line.stubs(:args).returns([manifest, 'starwarsI', 'starwarsII'])
 
-        Puppet.expects(:[]=).with(:manifest,manifest)
         expect { @apply.main }.to exit_with 0
 
         msg = @logs.find {|m| m.message =~ /Only one file can be applied per run/ }