puppet 3.1.1 → 3.2.0.rc1

data/spec/integration/provider/service/systemd_spec.rb

@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+
+require 'spec_helper'
+
+describe Puppet::Type.type(:service).provider(:systemd), '(integration)' do
+  # TODO: Unfortunately there does not seem a way to stub the executable
+  #       checks in the systemd provider because they happen at load time.
+  it "should be considered suitable if /bin/systemctl is present", :if => File.executable?('/bin/systemctl') do
+    described_class.should be_suitable
+  end
+
+  it "should be considered suitable if /usr/bin/systemctl is present", :if => File.executable?('/usr/bin/systemctl')  do
+    described_class.should be_suitable
+  end
+
+  it "should not be cosidered suitable if systemctl is absent",
+    :unless => (File.executable?('/bin/systemctl') or File.executable?('/usr/bin/systemctl')) do
+    described_class.should_not be_suitable
+  end
+end

data/spec/integration/type/file_spec.rb

@@ -273,22 +273,20 @@ describe Puppet::Type.type(:file) do
 
             describe "that is readable" do
               it "should set the executable bits when creating the destination (#10315)" do
-                pending "bug #10315"
-
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
+                File.should be_directory(path)
                 (get_mode(path) & 07777).should == 0777
               end
 
               it "should set the executable bits when overwriting the destination (#10315)" do
-                pending "bug #10315"
-
                 FileUtils.touch(path)
 
-                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow, :backup => false)
                 catalog.apply
 
+                File.should be_directory(path)
                 (get_mode(path) & 07777).should == 0777
               end
             end
@@ -303,37 +301,41 @@ describe Puppet::Type.type(:file) do
                 set_mode(0700, link_target)
               end
 
-              it "should not set executable bits when creating the destination (#10315)" do
-                pending "bug #10315"
-
+              it "should set executable bits when creating the destination (#10315)" do
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
-                (get_mode(path) & 07777).should == 0666
+                File.should be_directory(path)
+                (get_mode(path) & 07777).should == 0777
               end
 
-              it "should not set executable bits when overwriting the destination" do
+              it "should set executable bits when overwriting the destination" do
                 FileUtils.touch(path)
 
-                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow, :backup => false)
                 catalog.apply
 
-                (get_mode(path) & 07777).should == 0666
+                File.should be_directory(path)
+                (get_mode(path) & 07777).should == 0777
               end
             end
           end
 
           describe "to a file" do
-            let(:target) { tmpfile('file_target') }
+            let(:link_target) { tmpfile('file_target') }
 
-            it "should create the file, not a symlink (#2817, #10315)" do
-              pending "bug #2817, #10315"
+            before :each do
+              FileUtils.touch(link_target)
 
+              File.symlink(link_target, link)
+            end
+
+            it "should create the file, not a symlink (#2817, #10315)" do
               catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
               catalog.apply
 
               File.should be_file(path)
-              (get_mode(path) & 07777) == 0600
+              (get_mode(path) & 07777).should == 0600
             end
 
             it "should overwrite the file" do
@@ -343,7 +345,7 @@ describe Puppet::Type.type(:file) do
               catalog.apply
 
               File.should be_file(path)
-              (get_mode(path) & 07777) == 0600
+              (get_mode(path) & 07777).should == 0600
             end
           end
 
@@ -365,13 +367,11 @@ describe Puppet::Type.type(:file) do
 
             describe "when following all links" do
               it "should create the destination and apply executable bits (#10315)" do
-                pending "bug #10315"
-
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
                 catalog.apply
 
                 File.should be_directory(path)
-                (get_mode(path) & 07777) == 0777
+                (get_mode(path) & 07777).should == 0700
               end
 
               it "should overwrite the destination and apply executable bits" do
@@ -381,7 +381,7 @@ describe Puppet::Type.type(:file) do
                 catalog.apply
 
                 File.should be_directory(path)
-                (get_mode(path) & 07777) == 0777
+                (get_mode(path) & 0111).should == 0100
               end
             end
           end

data/spec/integration/type/package_spec.rb

@@ -11,7 +11,7 @@ describe Puppet::Type.type(:package), "when choosing a default package provider"
     if Facter.value(:operatingsystem) == 'Solaris' && Puppet::Util::Package.versioncmp(Facter.value(:kernelrelease), '5.11') >= 0
       :pkg
     else
-      {"Ubuntu" => :apt, "Debian" => :apt, "Darwin" => :pkgdmg, "RedHat" => :up2date, "Fedora" => :yum, "FreeBSD" => :ports, "OpenBSD" => :openbsd, "Solaris" => :sun, "DragonFly" => :pkgin}[os]
+      {"Ubuntu" => :apt, "Debian" => :apt, "Darwin" => :pkgdmg, "RedHat" => :up2date, "Fedora" => :yum, "FreeBSD" => :ports, "OpenBSD" => :openbsd, "Solaris" => :sun, "DragonFly" => :pkgin, "OpenWrt" => :opkg}[os]
     end
   end
 

data/spec/lib/puppet_spec/database.rb

@@ -22,11 +22,8 @@ end
 # ready to roll with a serious database and all.  Cleanup is handled
 # automatically for you.  Nothing to do there.
 def setup_scratch_database
-  Puppet::Rails.stubs(:database_arguments).returns(
-    :adapter => 'sqlite3',
-    :log_level => Puppet[:rails_loglevel],
-    :database => ':memory:'
-  )
+  Puppet[:dbadapter] = 'sqlite3'
+  Puppet[:dblocation] = ':memory'
   Puppet[:railslog] = PuppetSpec::Files.tmpfile('storeconfigs.log')
   Puppet::Rails.init
 end

data/spec/spec_helper.rb

@@ -67,7 +67,12 @@ RSpec.configure do |config|
   if Puppet::Util::Platform.windows?
     config.output_stream = $stdout
     config.error_stream = $stderr
-    config.formatters.each { |f| f.instance_variable_set(:@output, $stdout) }
+
+    config.formatters.each do |f|
+      if not f.instance_variable_get(:@output).kind_of?(::File)
+        f.instance_variable_set(:@output, $stdout)
+      end
+    end
   end
 
   Puppet::Test::TestHelper.initialize

data/spec/unit/application/apply_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::Application::Apply do
     Puppet::Node.indirection.cache_class = nil
   end
 
-  [:debug,:loadclasses,:verbose,:use_nodes,:detailed_exitcodes,:catalog].each do |option|
+  [:debug,:loadclasses,: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
@@ -241,6 +241,21 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
       end
 
+      it "should not save the classes or resource file by default" do
+        @catalog.expects(:write_class_file).never
+        @catalog.expects(:write_resource_file).never
+        expect { @apply.main }.to exit_with 0
+      end
+
+      it "should save the classes and resources files when requested" do
+        @apply.options[:write_catalog_summary] = true
+
+        @catalog.expects(:write_class_file).once
+        @catalog.expects(:write_resource_file).once
+
+        expect { @apply.main }.to exit_with 0
+      end
+
       it "should call the prerun and postrun commands on a Configurer instance" do
         Puppet::Configurer.any_instance.expects(:execute_prerun_command).returns(true)
         Puppet::Configurer.any_instance.expects(:execute_postrun_command).returns(true)

data/spec/unit/application/describe_spec.rb

@@ -29,7 +29,7 @@ describe Puppet::Application::Describe do
 
 
   describe "in preinit" do
-    it "should set options[:parameteers] to true" do
+    it "should set options[:parameters] to true" do
       @describe.preinit
 
       @describe.options[:parameters].should be_true

data/spec/unit/application/doc_spec.rb

@@ -143,6 +143,61 @@ describe Puppet::Application::Doc do
       @doc.setup
     end
 
+    describe "configuring logging" do
+      before :each do
+        Puppet::Util::Log.stubs(:newdestination)
+      end
+
+      describe "with --debug" do
+        before do
+          @doc.options[:debug] = true
+        end
+
+        it "should set log level to debug" do
+          @doc.setup
+          Puppet::Util::Log.level.should == :debug
+        end
+
+        it "should set log destination to console" do
+          Puppet::Util::Log.expects(:newdestination).with(:console)
+          @doc.setup
+        end
+      end
+
+      describe "with --verbose" do
+        before do
+          @doc.options[:verbose] = true
+        end
+
+        it "should set log level to info" do
+          @doc.setup
+          Puppet::Util::Log.level.should == :info
+        end
+
+        it "should set log destination to console" do
+          Puppet::Util::Log.expects(:newdestination).with(:console)
+          @doc.setup
+        end
+      end
+
+      describe "without --debug or --verbose" do
+        before do
+          @doc.options[:debug] = false
+          @doc.options[:verbose] = false
+        end
+
+        it "should set log level to warning" do
+          @doc.setup
+          Puppet::Util::Log.level.should == :warning
+        end
+
+        it "should set log destination to console" do
+          Puppet::Util::Log.expects(:newdestination).with(:console)
+          @doc.setup
+        end
+      end
+    end
+
     describe "in non-rdoc mode" do
       it "should get all non-dynamic reference if --all" do
         @doc.options[:all] = true
@@ -163,10 +218,6 @@ describe Puppet::Application::Doc do
     end
 
     describe "in rdoc mode" do
-      before :each do
-        Puppet::Util::Log.stubs(:newdestination)
-      end
-
       describe "when there are unknown args" do
         it "should expand --modulepath if any" do
           @doc.unknown_args = [ { :opt => "--modulepath", :arg => "path" } ]
@@ -199,34 +250,6 @@ describe Puppet::Application::Doc do
 
         @doc.setup_rdoc
       end
-
-      it "should set log level to debug if --debug" do
-        @doc.options[:debug] = true
-        @doc.setup_rdoc
-        Puppet::Util::Log.level.should == :debug
-      end
-
-      it "should set log level to info if --verbose" do
-        @doc.options[:verbose] = true
-        @doc.setup_rdoc
-        Puppet::Util::Log.level.should == :info
-      end
-
-      it "should set log destination to console if --verbose" do
-        @doc.options[:verbose] = true
-
-        Puppet::Util::Log.expects(:newdestination).with(:console)
-
-        @doc.setup_rdoc
-      end
-
-      it "should set log destination to console if --debug" do
-        @doc.options[:debug] = true
-
-        Puppet::Util::Log.expects(:newdestination).with(:console)
-
-        @doc.setup_rdoc
-      end
     end
   end
 

data/spec/unit/application/kick_spec.rb

@@ -2,11 +2,11 @@
 require 'spec_helper'
 
 require 'puppet/application/kick'
+require 'puppet/run'
+require 'puppet/util/ldap/connection'
 
 describe Puppet::Application::Kick, :if => Puppet.features.posix? do
-
   before :each do
-    require 'puppet/util/ldap/connection'
     Puppet::Util::Ldap::Connection.stubs(:new).returns(stub_everything)
     @kick = Puppet::Application[:kick]
     Puppet::Util::Log.stubs(:newdestination)
@@ -82,7 +82,7 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
       @kick.preinit
     end
 
-    [:all, :foreground, :debug, :ping, :test].each do |option|
+    [:all, :foreground, :debug, :ping, :test, :ignoreschedules].each do |option|
       it "should declare handle_#{option} method" do
         @kick.should respond_to("handle_#{option}".to_sym)
       end
@@ -226,7 +226,7 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
         @kick.options.stubs(:[]).with(:debug).returns(false)
         @kick.options.stubs(:[]).with(:verbose).returns(false) # needed when logging is initialized
         @kick.options.stubs(:[]).with(:setdest).returns(false) # needed when logging is initialized
-         
+
         @kick.stubs(:print)
         @kick.preinit
         @kick.stubs(:parse_options)
@@ -256,7 +256,6 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
 
       describe "during call of run_for_host" do
         before do
-          require 'puppet/run'
           options = {
             :background => true, :ignoreschedules => false, :tags => []
           }
@@ -264,13 +263,16 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
           @agent_run = Puppet::Run.new( options.dup )
           @agent_run.stubs(:status).returns("success")
 
+          # ensure that we don't actually run the agent
+          @agent_run.stubs(:run).returns(@agent_run)
+
+          Puppet::Run.indirection.terminus_class = :local
           Puppet::Run.indirection.expects(:terminus_class=).with( :rest )
           Puppet::Run.expects(:new).with( options ).returns(@agent_run)
         end
 
         it "should call run on a Puppet::Run for the given host" do
           Puppet::Run.indirection.expects(:save).with(@agent_run, 'https://host:8139/production/run/host').returns(@agent_run)
-
           expect { @kick.run_for_host('host') }.to exit_with 0
         end
 

data/spec/unit/application/master_spec.rb

@@ -241,25 +241,25 @@ describe Puppet::Application::Master, :unless => Puppet.features.microsoft_windo
       before do
         Puppet[:manifest] = "site.pp"
         Puppet.stubs(:err)
-        @master.stubs(:jj)
+        @master.stubs(:puts)
       end
 
       it "should compile a catalog for the specified node" do
         @master.options[:node] = "foo"
         Puppet::Resource::Catalog.indirection.expects(:find).with("foo").returns Puppet::Resource::Catalog.new
-        $stdout.stubs(:puts)
 
         expect { @master.compile }.to exit_with 0
       end
 
-      it "should convert the catalog to a pure-resource catalog and use 'jj' to pretty-print the catalog" do
+      it "should convert the catalog to a pure-resource catalog and use 'PSON::pretty_generate' to pretty-print the catalog" do
         catalog = Puppet::Resource::Catalog.new
+        PSON.stubs(:pretty_generate)
         Puppet::Resource::Catalog.indirection.expects(:find).returns catalog
 
         catalog.expects(:to_resource).returns("rescat")
 
         @master.options[:node] = "foo"
-        @master.expects(:jj).with("rescat")
+        PSON.expects(:pretty_generate).with('rescat', :allow_nan => true, :max_nesting => false)
 
         expect { @master.compile }.to exit_with 0
       end

data/spec/unit/daemon_spec.rb

@@ -203,7 +203,7 @@ describe Puppet::Daemon, :unless => Puppet.features.microsoft_windows? do
 
     it "should run the agent if one is available and it is not running" do
       @agent.expects(:running?).returns false
-      @agent.expects :run
+      @agent.expects(:run).with({:splay => false})
 
       @daemon.agent = @agent
 

data/spec/unit/forge/errors_spec.rb

@@ -39,4 +39,44 @@ Could not connect to http://fake.com:1111
     end
   end
 
+  describe 'ResponseError' do
+    subject { Puppet::Forge::Errors::ResponseError }
+    let(:response) { stub(:body => '{}', :code => '404', :message => "not found") }
+
+    context 'without message' do
+      let(:exception) { subject.new(:uri => 'http://fake.com:1111', :response => response, :input => 'user/module') }
+
+      it 'should return a valid single line error' do
+        exception.message.should == 'Could not execute operation for \'user/module\'. Detail: 404 not found.'
+      end
+
+      it 'should return a valid multiline error' do
+        exception.multiline.should == <<-eos.chomp
+Could not execute operation for 'user/module'
+  The server being queried was http://fake.com:1111
+  The HTTP response we received was '404 not found'
+    Check the author and module names are correct.
+        eos
+      end
+    end
+
+    context 'with message' do
+      let(:exception) { subject.new(:uri => 'http://fake.com:1111', :response => response, :input => 'user/module', :message => 'no such module') }
+
+      it 'should return a valid single line error' do
+        exception.message.should == 'Could not execute operation for \'user/module\'. Detail: no such module / 404 not found.'
+      end
+
+      it 'should return a valid multiline error' do
+        exception.multiline.should == <<-eos.chomp
+Could not execute operation for 'user/module'
+  The server being queried was http://fake.com:1111
+  The HTTP response we received was '404 not found'
+  The message we received said 'no such module'
+    Check the author and module names are correct.
+        eos
+      end
+    end
+  end
+
 end