puppet 2.7.9 → 2.7.11

data/spec/unit/agent/disabler_spec.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'puppet/agent'
+require 'puppet/agent/locker'
+
+class LockerTester
+  include Puppet::Agent::Disabler
+end
+
+describe Puppet::Agent::Disabler do
+  before do
+    @locker = LockerTester.new
+    @locker.stubs(:lockfile_path).returns "/my/lock"
+  end
+
+  it "should use an AnonymousFilelock instance as its disable_lockfile" do
+    @locker.disable_lockfile.should be_instance_of(Puppet::Util::AnonymousFilelock)
+  end
+
+  it "should use 'lockfile_path' to determine its disable_lockfile path" do
+    @locker.expects(:lockfile_path).returns "/my/lock"
+    lock = Puppet::Util::AnonymousFilelock.new("/my/lock")
+    Puppet::Util::AnonymousFilelock.expects(:new).with("/my/lock.disabled").returns lock
+
+    @locker.disable_lockfile
+  end
+
+  it "should reuse the same lock file each time" do
+    @locker.disable_lockfile.should equal(@locker.disable_lockfile)
+  end
+
+  it "should lock the anonymous lock when disabled" do
+    @locker.disable_lockfile.expects(:lock)
+
+    @locker.disable
+  end
+
+  it "should disable with a message" do
+    @locker.disable_lockfile.expects(:lock).with("disabled because")
+
+    @locker.disable("disabled because")
+  end
+
+  it "should unlock the anonymous lock when enabled" do
+    @locker.disable_lockfile.expects(:unlock)
+
+    @locker.enable
+  end
+
+  it "should check the lock if it is disabled" do
+    @locker.disable_lockfile.expects(:locked?)
+
+    @locker.disabled?
+  end
+
+  it "should report the disable message when disabled" do
+    @locker.disable_lockfile.expects(:message).returns("message")
+    @locker.disable_message.should == "message"
+  end
+end

data/spec/unit/agent/locker_spec.rb

@@ -29,18 +29,6 @@ describe Puppet::Agent::Locker do
     @locker.lockfile.should equal(@locker.lockfile)
   end
 
-  it "should use the lock file to anonymously lock the process when disabled" do
-    @locker.lockfile.expects(:lock).with(:anonymous => true)
-
-    @locker.disable
-  end
-
-  it "should use the lock file to anonymously unlock the process when enabled" do
-    @locker.lockfile.expects(:unlock).with(:anonymous => true)
-
-    @locker.enable
-  end
-
   it "should have a method that yields when a lock is attained" do
     @locker.lockfile.expects(:lock).returns true
 

data/spec/unit/agent_spec.rb

@@ -24,6 +24,7 @@ describe Puppet::Agent do
 
     # So we don't actually try to hit the filesystem.
     @agent.stubs(:lock).yields
+    @agent.stubs(:disabled?).returns(false)
 
     # make Puppet::Application safe for stubbing; restore in an :after block; silence warnings for this.
     without_warnings { Puppet::Application = Class.new(Puppet::Application) }
@@ -76,6 +77,7 @@ describe Puppet::Agent do
 
   describe "when being run" do
     before do
+      AgentTestClient.stubs(:lockfile_path).returns "/my/lock"
       @agent.stubs(:running?).returns false
     end
 
@@ -92,6 +94,12 @@ describe Puppet::Agent do
       @agent.run
     end
 
+    it "should do nothing if disabled" do
+      @agent.expects(:disabled?).returns(true)
+      AgentTestClient.expects(:new).never
+      @agent.run
+    end
+
     it "should use Puppet::Application.controlled_run to manage process state behavior" do
       calls = sequence('calls')
       Puppet::Application.expects(:controlled_run).yields.in_sequence(calls)

data/spec/unit/application/agent_spec.rb

@@ -91,7 +91,7 @@ describe Puppet::Application::Agent do
       @puppetd.command_line.stubs(:args).returns([])
     end
 
-    [:centrallogging, :disable, :enable, :debug, :fqdn, :test, :verbose, :digest].each do |option|
+    [:centrallogging, :enable, :debug, :fqdn, :test, :verbose, :digest].each do |option|
       it "should declare handle_#{option} method" do
         @puppetd.should respond_to("handle_#{option}".to_sym)
       end
@@ -102,6 +102,24 @@ describe Puppet::Application::Agent do
       end
     end
 
+    describe "when handling --disable" do
+      it "should declare handle_disable method" do
+        @puppetd.should respond_to(:handle_disable)
+      end
+
+      it "should set disable to true" do
+        @puppetd.options.stubs(:[]=)
+        @puppetd.options.expects(:[]=).with(:disable, true)
+        @puppetd.handle_disable('')
+      end
+
+      it "should store disable message" do
+        @puppetd.options.stubs(:[]=)
+        @puppetd.options.expects(:[]=).with(:disable_message, "message")
+        @puppetd.handle_disable('message')
+      end
+    end
+
     it "should set an existing handler on server" do
       Puppet::Network::Handler.stubs(:handler).with("handler").returns(true)
 
@@ -349,6 +367,20 @@ describe Puppet::Application::Agent do
         end
       end
 
+      it "should pass the disable message when disabling" do
+        @puppetd.options.stubs(:[]).with(:disable).returns(true)
+        @puppetd.options.stubs(:[]).with(:disable_message).returns("message")
+        @agent.expects(:disable).with("message")
+        expect { @puppetd.enable_disable_client(@agent) }.to exit_with 0
+      end
+
+      it "should pass the default disable message when disabling without a message" do
+        @puppetd.options.stubs(:[]).with(:disable).returns(true)
+        @puppetd.options.stubs(:[]).with(:disable_message).returns(nil)
+        @agent.expects(:disable).with("reason not specified")
+        expect { @puppetd.enable_disable_client(@agent) }.to exit_with 0
+      end
+
       it "should finally exit" do
         expect { @puppetd.enable_disable_client(@agent) }.to exit_with 0
       end
@@ -523,6 +555,11 @@ describe Puppet::Application::Agent do
         expect { @puppetd.onetime }.to exit_with 0
       end
 
+      it "should stop the daemon" do
+        @daemon.expects(:stop).with(:exit => false)
+        expect { @puppetd.onetime }.to exit_with 0
+      end
+
       describe "and --detailed-exitcodes" do
         before :each do
           @puppetd.options.stubs(:[]).with(:detailed_exitcodes).returns(true)

data/spec/unit/application/apply_spec.rb

@@ -210,52 +210,12 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
       end
 
-      it "should set the facts name based on the node_name_fact" do
-        @facts = Puppet::Node::Facts.new(Puppet[:node_name_value], 'my_name_fact' => 'other_node_name')
-        Puppet::Node::Facts.indirection.save(@facts)
-
-        node = Puppet::Node.new('other_node_name')
-        Puppet::Node.indirection.save(node)
-
-        Puppet[:node_name_fact] = 'my_name_fact'
-
-        expect { @apply.main }.to exit_with 0
-
-        @facts.name.should == 'other_node_name'
-      end
-
-      it "should set the node_name_value based on the node_name_fact" do
-        facts = Puppet::Node::Facts.new(Puppet[:node_name_value], 'my_name_fact' => 'other_node_name')
-        Puppet::Node::Facts.indirection.save(facts)
-        node = Puppet::Node.new('other_node_name')
-        Puppet::Node.indirection.save(node)
-        Puppet[:node_name_fact] = 'my_name_fact'
-
-        expect { @apply.main }.to exit_with 0
-
-        Puppet[:node_name_value].should == 'other_node_name'
-      end
-
-      it "should raise an error if we can't find the facts" do
-        Puppet::Node::Facts.indirection.expects(:find).returns(nil)
-
-        lambda { @apply.main }.should raise_error
-      end
-
       it "should raise an error if we can't find the node" do
         Puppet::Node.indirection.expects(:find).returns(nil)
 
         lambda { @apply.main }.should raise_error
       end
 
-      it "should merge in our node the loaded facts" do
-        @facts.values = {'key' => 'value'}
-
-        expect { @apply.main }.to exit_with 0
-
-        @node.parameters['key'].should == 'value'
-      end
-
       it "should load custom classes if loadclasses" do
         @apply.options[:loadclasses] = true
         classfile = tmpfile('classfile')
@@ -308,6 +268,40 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
       end
 
+      describe "when using node_name_fact" do
+        before :each do
+          @facts = Puppet::Node::Facts.new(Puppet[:node_name_value], 'my_name_fact' => 'other_node_name')
+          Puppet::Node::Facts.indirection.save(@facts)
+          @node = Puppet::Node.new('other_node_name')
+          Puppet::Node.indirection.save(@node)
+          Puppet[:node_name_fact] = 'my_name_fact'
+        end
+
+        it "should set the facts name based on the node_name_fact" do
+          expect { @apply.main }.to exit_with 0
+          @facts.name.should == 'other_node_name'
+        end
+
+        it "should set the node_name_value based on the node_name_fact" do
+          expect { @apply.main }.to exit_with 0
+          Puppet[:node_name_value].should == 'other_node_name'
+        end
+
+        it "should merge in our node the loaded facts" do
+          @facts.values.merge!('key' => 'value')
+
+          expect { @apply.main }.to exit_with 0
+
+          @node.parameters['key'].should == 'value'
+        end
+
+        it "should raise an error if we can't find the facts" do
+          Puppet::Node::Facts.indirection.expects(:find).returns(nil)
+
+          lambda { @apply.main }.should raise_error
+        end
+      end
+
       describe "with detailed_exitcodes" do
         before :each do
           @apply.options[:detailed_exitcodes] = true

data/spec/unit/application/cert_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/application/cert'
 
-describe Puppet::Application::Cert, :'fails_on_ruby_1.9.2' => true do
+describe Puppet::Application::Cert => true do
   before :each do
     @cert_app = Puppet::Application[:cert]
     Puppet::Util::Log.stubs(:newdestination)

data/spec/unit/application_spec.rb

@@ -8,6 +8,7 @@ require 'getoptlong'
 describe Puppet::Application do
 
   before do
+    Puppet::Util::Instrumentation.stubs(:init)
     @app = Class.new(Puppet::Application).new
     @appclass = @app.class
 
@@ -117,6 +118,11 @@ describe Puppet::Application do
     @app.run_command
   end
 
+  it "should initialize the Puppet Instrumentation layer on creation" do
+    Puppet::Util::Instrumentation.expects(:init)
+    Class.new(Puppet::Application).new
+  end
+
   describe 'when invoking clear!' do
     before :each do
       Puppet::Application.run_status = :stop_requested

data/spec/unit/configurer/downloader_spec.rb

@@ -60,16 +60,35 @@ describe Puppet::Configurer::Downloader do
       @dler.file
     end
 
-    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 }
-      @dler.file
-    end
-
-    it "should always set the group to the current GID" do
-      Process.expects(:gid).returns 61
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == 61 }
-      @dler.file
+    describe "on POSIX" do
+      before :each do
+        Puppet.features.stubs(:microsoft_windows?).returns false
+      end
+
+      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 }
+        @dler.file
+      end
+
+      it "should always set the group to the current GID" do
+        Process.expects(:gid).returns 61
+        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == 61 }
+        @dler.file
+      end
+    end
+
+    describe "on Windows", :if => Puppet.features.microsoft_windows? do
+      it "should always set the owner to the current user" do
+        Sys::Admin.expects(:get_login).returns 'foo'
+        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == 'foo' }
+        @dler.file
+      end
+
+      it "should always set the group to nobody" do
+        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == 'S-1-0-0' }
+        @dler.file
+      end
     end
 
     it "should always force the download" do

data/spec/unit/configurer/fact_handler_spec.rb

@@ -78,12 +78,6 @@ describe Puppet::Configurer::FactHandler do
       Puppet[:node_name_value].should == 'other_node_name'
     end
 
-    it "should reload Facter before finding facts" do
-      @facthandler.expects(:reload_facter)
-
-      @facthandler.find_facts
-    end
-
     it "should fail if finding facts fails" do
       Puppet[:trace] = false
       Puppet[:certname] = "myhost"
@@ -93,6 +87,11 @@ describe Puppet::Configurer::FactHandler do
     end
   end
 
+  it "should only load fact plugins once" do
+    Puppet::Node::Facts.indirection.expects(:find).once
+    @facthandler.find_facts
+  end
+
   it "should warn about factsync deprecation when factsync is enabled" do
     Puppet::Configurer::Downloader.stubs(:new).returns mock("downloader", :evaluate => nil)
 
@@ -145,27 +144,4 @@ describe Puppet::Configurer::FactHandler do
 
     @facthandler.facts_for_uploading
   end
-
-  describe "when reloading Facter" do
-    before do
-      Facter.stubs(:clear)
-      Facter.stubs(:load)
-      Facter.stubs(:loadfacts)
-    end
-
-    it "should clear Facter" do
-      Facter.expects(:clear)
-      @facthandler.reload_facter
-    end
-
-    it "should load all Facter facts" do
-      Facter.expects(:loadfacts)
-      @facthandler.reload_facter
-    end
-
-    it "should use the Facter terminus load all Puppet Fact plugins" do
-      Puppet::Node::Facts::Facter.expects(:load_fact_plugins)
-      @facthandler.reload_facter
-    end
-  end
 end

data/spec/unit/configurer_spec.rb

@@ -407,25 +407,26 @@ describe Puppet::Configurer do
   end
 
   describe "when saving the summary report file" do
+    include PuppetSpec::Files
+
     before do
       Puppet.settings.stubs(:use).returns(true)
       @configurer = Puppet::Configurer.new
 
-      @report = stub 'report'
-      @trans = stub 'transaction'
-      @lastrunfd = stub 'lastrunfd'
-      Puppet::Util::FileLocking.stubs(:writelock).yields(@lastrunfd)
+      @report = stub 'report', :raw_summary => {}
+
+      Puppet[:lastrunfile] = tmpfile('last_run_file')
     end
 
-    it "should write the raw summary to the lastrunfile setting value" do
-      Puppet::Util::FileLocking.expects(:writelock).with(Puppet[:lastrunfile], 0660)
+    it "should write the last run file" do
       @configurer.save_last_run_summary(@report)
+      FileTest.exists?(Puppet[:lastrunfile]).should be_true
     end
 
     it "should write the raw summary as yaml" do
       @report.expects(:raw_summary).returns("summary")
-      @lastrunfd.expects(:print).with(YAML.dump("summary"))
       @configurer.save_last_run_summary(@report)
+      File.read(Puppet[:lastrunfile]).should == YAML.dump("summary")
     end
 
     it "should log but not fail if saving the last run summary fails" do
@@ -433,7 +434,6 @@ describe Puppet::Configurer do
       Puppet.expects(:err)
       lambda { @configurer.save_last_run_summary(@report) }.should_not raise_error
     end
-
   end
 
   describe "when retrieving a catalog" do

data/spec/unit/daemon_spec.rb

@@ -10,6 +10,8 @@ def without_warnings
 end
 
 describe Puppet::Daemon do
+  include PuppetSpec::Files
+
   before do
     @daemon = Puppet::Daemon.new
   end
@@ -141,9 +143,9 @@ describe Puppet::Daemon do
       pidfile = mock 'pidfile'
 
       Puppet.settings.stubs(:value).with(:name).returns "eh"
-      Puppet.settings.expects(:value).with(:pidfile).returns "/my/file"
+      Puppet.settings.expects(:value).with(:pidfile).returns make_absolute("/my/file")
 
-      Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
+      Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
       pidfile.expects(:lock).returns true
       @daemon.create_pidfile
@@ -153,9 +155,9 @@ describe Puppet::Daemon do
       pidfile = mock 'pidfile'
 
       Puppet.settings.stubs(:value).with(:name).returns "eh"
-      Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
+      Puppet.settings.stubs(:value).with(:pidfile).returns make_absolute("/my/file")
 
-      Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
+      Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
       pidfile.expects(:lock).returns false
 
@@ -173,36 +175,20 @@ describe Puppet::Daemon do
     end
 
     it "should do nothing if the pidfile is not present" do
-      pidfile = mock 'pidfile', :locked? => false
-      Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
+      pidfile = mock 'pidfile', :unlock => false
 
-      Puppet.settings.stubs(:value).with(:name).returns "eh"
-      Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
+      Puppet[:pidfile] = make_absolute("/my/file")
+      Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
-      pidfile.expects(:unlock).never
       @daemon.remove_pidfile
     end
 
     it "should unlock the pidfile using the Pidlock class" do
-      pidfile = mock 'pidfile', :locked? => true
-      Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
-      pidfile.expects(:unlock).returns true
+      pidfile = mock 'pidfile', :unlock => true
 
-      Puppet.settings.stubs(:value).with(:name).returns "eh"
-      Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
-
-      @daemon.remove_pidfile
-    end
-
-    it "should warn if it cannot remove the pidfile" do
-      pidfile = mock 'pidfile', :locked? => true
-      Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
-      pidfile.expects(:unlock).returns false
-
-      Puppet.settings.stubs(:value).with(:name).returns "eh"
-      Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
+      Puppet[:pidfile] = make_absolute("/my/file")
+      Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
-      Puppet.expects :err
       @daemon.remove_pidfile
     end
   end