puppet 3.3.2 → 3.4.0.rc1

data/spec/lib/matchers/containment_matchers.rb

@@ -0,0 +1,52 @@
+module ContainmentMatchers
+  class ContainClass
+    def initialize(containee)
+      @containee = containee
+    end
+
+    def in(container)
+      @container = container
+      self
+    end
+
+    def matches?(catalog)
+      @catalog = catalog
+
+      raise ArgumentError, "You must set the container using #in" unless @container
+
+      @container_resource = catalog.resource("Class", @container)
+      @containee_resource = catalog.resource("Class", @containee)
+
+      if @containee_resource && @container_resource
+        catalog.edge?(@container_resource, @containee_resource)
+      else
+        false
+      end
+    end
+
+    def failure_message_for_should
+      message = "Expected #{@catalog.to_dot} to contain Class #{@containee.inspect} inside of Class #{@container.inspect} but "
+
+      missing = []
+      if @container_resource.nil?
+        missing << @container
+      end
+      if @containee_resource.nil?
+        missing << @containee
+      end
+
+      if ! missing.empty?
+        message << "the catalog does not contain #{missing.map(&:inspect).join(' or ')}"
+      else
+        message << "no containment relationship exists"
+      end
+
+      message
+    end
+  end
+
+  # expect(catalog).to contain_class(containee).in(container)
+  def contain_class(containee)
+    ContainClass.new(containee)
+  end
+end

data/spec/lib/puppet_spec/compiler.rb

@@ -27,4 +27,10 @@ module PuppetSpec::Compiler
 
     transaction
   end
+
+  def order_resources_traversed_in(relationships)
+    order_seen = []
+    relationships.traverse { |resource| order_seen << resource.ref }
+    order_seen
+  end
 end

data/spec/lib/puppet_spec/files.rb

@@ -1,26 +1,13 @@
 require 'fileutils'
 require 'tempfile'
+require 'tmpdir'
 require 'pathname'
 
 # A support module for testing files.
 module PuppetSpec::Files
-  # This code exists only to support tests that run as root, pretty much.
-  # Once they have finally been eliminated this can all go... --daniel 2011-04-08
-  def self.in_tmp(path)
-    tempdir = Dir.tmpdir
-
-    Pathname.new(path).ascend do |dir|
-      return true if File.identical?(tempdir, dir)
-    end
-
-    false
-  end
-
   def self.cleanup
     $global_tempfiles ||= []
     while path = $global_tempfiles.pop do
-      fail "Not deleting tmpfile #{path} outside regular tmpdir" unless in_tmp(path)
-
       begin
         FileUtils.rm_rf path, :secure => true
       rescue Errno::ENOENT
@@ -43,18 +30,30 @@ module PuppetSpec::Files
     path = source.path
     source.close!
 
-    # ...record it for cleanup,
-    $global_tempfiles ||= []
-    $global_tempfiles << File.expand_path(path)
+    record_tmp(File.expand_path(path))
 
-    # ...and bam.
     path
   end
 
+  def file_containing(name, contents) PuppetSpec::Files.file_containing(name, contents) end
+  def self.file_containing(name, contents)
+    file = tmpfile(name)
+    File.open(file, 'wb') { |f| f.write(contents) }
+    file
+  end
+
   def tmpdir(name) PuppetSpec::Files.tmpdir(name) end
   def self.tmpdir(name)
-    path = tmpfile(name)
-    FileUtils.mkdir_p(path)
-    path
+    dir = Dir.mktmpdir(name)
+
+    record_tmp(dir)
+
+    dir
+  end
+
+  def self.record_tmp(tmp)
+    # ...record it for cleanup,
+    $global_tempfiles ||= []
+    $global_tempfiles << tmp
   end
 end

data/spec/shared_behaviours/documentation_on_faces.rb

@@ -62,7 +62,7 @@ shared_examples_for "documentation on faces" do
             end
 
             it "should not remove formatting whitespace, only global indent" do
-              text = "this\n  is\n    the\n  ultimate\ntest\n"
+              text = "this\n  is\n    the\n  ultimate\ntest"
               subject.send(setter, text.gsub(/^/, indent))
               subject.send(getter).should == text
             end
@@ -70,8 +70,8 @@ shared_examples_for "documentation on faces" do
         end
 
         it "should strip whitespace with a blank line" do
-          subject.send(setter, "  this\n\n  should outdent\n")
-          subject.send(getter).should == "this\n\nshould outdent\n"
+          subject.send(setter, "  this\n\n  should outdent")
+          subject.send(getter).should == "this\n\nshould outdent"
         end
       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)
-    FileTest.stubs(:exists?).returns true
-    FileTest.stubs(:exists?).with(Puppet[:fileserverconfig]).returns(true)
+    Puppet::FileSystem::File.stubs(:exist?).returns true
+    Puppet::FileSystem::File.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
 
     @path = Tempfile.new("file_server_testing")
     path = @path.path

data/spec/shared_contexts/platform.rb

@@ -6,6 +6,7 @@
 shared_context "windows", :as_platform => :windows do
   before :each do
     Facter.stubs(:value).with(:operatingsystem).returns 'Windows'
+    Facter.stubs(:value).with(:osfamily).returns 'windows'
     Puppet.features.stubs(:microsoft_windows?).returns(true)
     Puppet.features.stubs(:posix?).returns(false)
   end

data/spec/spec_helper.rb

@@ -43,6 +43,18 @@ 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
 
@@ -146,6 +158,6 @@ RSpec.configure do |config|
     # Clean up switch of TMPDIR, don't know if needed after this, so needs to reset it
     # to old before removing it
     ENV['TMPDIR'] = oldtmpdir
-    FileUtils.rm_rf(tmpdir) if File.exists?(tmpdir) && tmpdir.to_s.start_with?(oldtmpdir)
+    FileUtils.rm_rf(tmpdir) if Puppet::FileSystem::File.exist?(tmpdir) && tmpdir.to_s.start_with?(oldtmpdir)
   end
 end

data/spec/unit/agent_spec.rb

@@ -135,18 +135,6 @@ describe Puppet::Agent do
       @agent.run
     end
 
-    it "should use a mutex to restrict multi-threading" do
-      client = AgentTestClient.new
-      AgentTestClient.expects(:new).returns client
-
-      mutex = mock 'mutex'
-      @agent.expects(:sync).returns mutex
-
-      mutex.expects(:synchronize)
-      client.expects(:run).never # if it doesn't run, then we know our yield is what triggers it
-      @agent.run
-    end
-
     it "should use a filesystem lock to restrict multiple processes running the agent" do
       client = AgentTestClient.new
       AgentTestClient.expects(:new).returns client

data/spec/unit/application/agent_spec.rb

@@ -198,7 +198,7 @@ describe Puppet::Application::Agent do
   describe "during setup" do
     before :each do
       Puppet.stubs(:info)
-      FileTest.stubs(:exists?).returns(true)
+      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=)
@@ -449,8 +449,8 @@ describe Puppet::Application::Agent do
 
     describe "when setting up listen" do
       before :each do
-        FileTest.stubs(:exists?).with('auth').returns(true)
-        File.stubs(:exist?).returns(true)
+        Puppet::FileSystem::File.stubs(:exist?).with('auth').returns(true)
+        Puppet::FileSystem::File.stubs(:exist?).returns(true)
         @puppetd.options[:serve] = []
         @server = stub_everything 'server'
         Puppet::Network::Server.stubs(:new).returns(@server)
@@ -460,7 +460,7 @@ describe Puppet::Application::Agent do
       it "should exit if no authorization file" do
         Puppet[:listen] = true
         Puppet.stubs(:err)
-        FileTest.stubs(:exists?).with(Puppet[:rest_authconfig]).returns(false)
+        Puppet::FileSystem::File.stubs(:exist?).with(Puppet[:rest_authconfig]).returns(false)
 
         expect do
           execute_agent

data/spec/unit/application/apply_spec.rb

@@ -45,8 +45,8 @@ describe Puppet::Application::Apply do
       @apply.handle_logdest("console")
     end
 
-    it "should put the logset options to true" do
-      @apply.options.expects(:[]=).with(:logset,true)
+    it "should set the setdest options to true" do
+      @apply.options.expects(:[]=).with(:setdest,true)
 
       @apply.handle_logdest("console")
     end
@@ -103,6 +103,22 @@ describe Puppet::Application::Apply do
       @apply.setup
     end
 
+    it "configures a profiler when profiling is enabled" do
+      Puppet[:profile] = true
+
+      @apply.setup
+
+      expect(Puppet::Util::Profiler.current).to be_a(Puppet::Util::Profiler::WallClock)
+    end
+
+    it "does not have a profiler if profiling is disabled" do
+      Puppet[:profile] = false
+
+      @apply.setup
+
+      expect(Puppet::Util::Profiler.current).to eq(Puppet::Util::Profiler::NONE)
+    end
+
     it "should set default_file_terminus to `file_server` to be local" do
       @apply.app_defaults[:default_file_terminus].should == :file_server
     end

data/spec/unit/application/cert_spec.rb

@@ -122,10 +122,12 @@ describe Puppet::Application::Cert => true do
       @ca = stub_everything 'ca'
       @cert_app.ca = @ca
       @cert_app.command_line.stubs(:args).returns([])
+      @iface = stub_everything 'iface'
+      Puppet::SSL::CertificateAuthority::Interface.stubs(:new).returns(@iface)
     end
 
     it "should delegate to the CertificateAuthority" do
-      @ca.expects(:apply)
+      @iface.expects(:apply)
 
       @cert_app.main
     end
@@ -133,7 +135,7 @@ describe Puppet::Application::Cert => true do
     it "should delegate with :all if option --all was given" do
       @cert_app.handle_all(0)
 
-      @ca.expects(:apply).with { |cert_mode,to| to[:to] == :all }
+      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to| to[:to] == :all }
 
       @cert_app.main
     end
@@ -141,7 +143,7 @@ describe Puppet::Application::Cert => true do
     it "should delegate to ca.apply with the hosts given on command line" do
       @cert_app.command_line.stubs(:args).returns(["host"])
 
-      @ca.expects(:apply).with { |cert_mode,to| to[:to] == ["host"]}
+      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to| to[:to] == ["host"]}
 
       @cert_app.main
     end
@@ -150,7 +152,7 @@ describe Puppet::Application::Cert => true do
       @cert_app.command_line.stubs(:args).returns(["host"])
       @cert_app.handle_digest(:digest)
 
-      @ca.expects(:apply).with { |cert_mode,to| to[:digest] == :digest}
+      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to| to[:digest] == :digest}
 
       @cert_app.main
     end
@@ -159,8 +161,8 @@ describe Puppet::Application::Cert => true do
       @cert_app.subcommand = :destroy
       @cert_app.command_line.stubs(:args).returns(["host"])
 
-      @ca.expects(:apply).with { |cert_mode,to| cert_mode == :revoke }
-      @ca.expects(:apply).with { |cert_mode,to| cert_mode == :destroy }
+      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to| cert_mode == :revoke }
+      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to| cert_mode == :destroy }
 
       @cert_app.main
     end

data/spec/unit/application/device_spec.rb

@@ -127,7 +127,7 @@ describe Puppet::Application::Device do
     before :each do
       @device.options.stubs(:[])
       Puppet.stubs(:info)
-      FileTest.stubs(:exists?).returns(true)
+      Puppet::FileSystem::File.stubs(:exist?).returns(true)
       Puppet[:libdir] = "/dev/null/lib"
       Puppet::SSL::Host.stubs(:ca_location=)
       Puppet::Transaction::Report.indirection.stubs(:terminus_class=)

data/spec/unit/application/filebucket_spec.rb

@@ -178,7 +178,7 @@ describe Puppet::Application::Filebucket do
 
       it "should call the client backup method for each given parameter" do
         @filebucket.stubs(:puts)
-        FileTest.stubs(:exists?).returns(true)
+        Puppet::FileSystem::File.stubs(:exist?).returns(true)
         FileTest.stubs(:readable?).returns(true)
         @filebucket.stubs(:args).returns(["file1", "file2"])
 

data/spec/unit/application/inspect_spec.rb

@@ -36,7 +36,7 @@ describe Puppet::Application::Inspect do
   describe "when executing" do
     before :each do
       Puppet[:report] = true
-      @inspect.options[:logset] = true
+      @inspect.options[:setdest] = true
       Puppet::Transaction::Report::Rest.any_instance.stubs(:save)
       @inspect.setup
     end

data/spec/unit/application_spec.rb

@@ -618,4 +618,28 @@ describe Puppet::Application do
     end
 
   end
+
+  describe "#handle_logdest_arg" do
+
+    let(:test_arg) { "arg_test_logdest" }
+
+    it "should log an exception that is raised" do
+      our_exception = Puppet::DevError.new("test exception")
+      Puppet::Util::Log.expects(:newdestination).with(test_arg).raises(our_exception)
+      Puppet.expects(:log_exception).with(our_exception)
+      @app.handle_logdest_arg(test_arg)
+    end
+
+    it "should set the new log destination" do
+      Puppet::Util::Log.expects(:newdestination).with(test_arg)
+      @app.handle_logdest_arg(test_arg)
+    end
+
+    it "should set the flag that a destination is set in the options hash" do
+      Puppet::Util::Log.stubs(:newdestination).with(test_arg)
+      @app.handle_logdest_arg(test_arg)
+      @app.options[:setdest].should be_true
+    end
+  end
+
 end

data/spec/unit/configurer/downloader_spec.rb

@@ -51,11 +51,7 @@ describe Puppet::Configurer::Downloader do
       @dler.file
     end
 
-    describe "on POSIX" do
-      before :each do
-        Puppet.features.stubs(:microsoft_windows?).returns false
-      end
-
+    describe "on POSIX", :as_platform => :posix do
       it "should always set the owner to the current UID" do
         Process.expects(:uid).returns 51
         Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == 51 }
@@ -69,7 +65,7 @@ describe Puppet::Configurer::Downloader do
       end
     end
 
-    describe "on Windows", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows", :as_platform => :windows do
       it "should omit the owner" do
         Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == nil }
         @dler.file
@@ -79,6 +75,11 @@ describe Puppet::Configurer::Downloader do
         Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == nil }
         @dler.file
       end
+
+      it "should set source_permissions to ignore" do
+        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:source_permissions] == :ignore }
+        @dler.file
+      end
     end
 
     it "should always force the download" do
@@ -135,7 +136,7 @@ describe Puppet::Configurer::Downloader do
       Puppet[:tags] = 'maytag'
       @dler.evaluate
 
-      File.exists?(@dl_name).should be_true
+      Puppet::FileSystem::File.exist?(@dl_name).should be_true
     end
 
     it "should log that it is downloading" do

data/spec/unit/configurer/fact_handler_spec.rb

@@ -3,6 +3,16 @@ require 'spec_helper'
 require 'puppet/configurer'
 require 'puppet/configurer/fact_handler'
 
+# the json-schema gem doesn't support windows
+if not Puppet.features.microsoft_windows?
+  describe "catalog facts schema" do
+    it "should validate against the json meta-schema" do
+      JSON::Validator.validate!(JSON_META_SCHEMA, FACTS_SCHEMA)
+    end
+  end
+
+ end
+
 class FactHandlerTester
   include Puppet::Configurer::FactHandler
 
@@ -74,4 +84,17 @@ describe Puppet::Configurer::FactHandler do
 
     @facthandler.facts_for_uploading.should == {:facts_format => :pson, :facts => text}
   end
+
+  def validate_json_for_facts(catalog_facts)
+    JSON::Validator.validate!(FACTS_SCHEMA, catalog_facts)
+  end
+
+  it "should generate valid facts data against the facts schema", :unless => Puppet.features.microsoft_windows? do
+    facts = Puppet::Node::Facts.new(Puppet[:node_name_value], 'my_name_fact' => 'other_node_name')
+    Puppet::Node::Facts.indirection.save(facts)
+
+    validate_json_for_facts(CGI.unescape(@facthandler.facts_for_uploading[:facts]))
+  end
+
 end
+