puppet 2.7.5 → 2.7.6

data/spec/unit/type_spec.rb

@@ -152,13 +152,31 @@ describe Puppet::Type, :fails_on_windows => true do
 
   describe "when creating a provider" do
     before :each do
-      @type = Puppet::Type.newtype(:provider_test_type)
+      @type = Puppet::Type.newtype(:provider_test_type) do
+        newparam(:name) { isnamevar }
+        newparam(:foo)
+        newproperty(:bar)
+      end
     end
 
     after :each do
       @type.provider_hash.clear
     end
 
+    describe "when determining if instances of the type are managed" do
+      it "should not consider audit only resources to be managed" do
+        @type.new(:name => "foo", :audit => 'all').managed?.should be_false
+      end
+
+      it "should not consider resources with only parameters to be managed" do
+        @type.new(:name => "foo", :foo => 'did someone say food?').managed?.should be_false
+      end
+
+      it "should consider resources with any properties set to be managed" do
+        @type.new(:name => "foo", :bar => 'Let us all go there').managed?.should be_true
+      end
+    end
+
     it "should create a subclass of Puppet::Provider for the provider" do
       provider = @type.provide(:test_provider)
 

data/spec/unit/util/adsi_spec.rb

@@ -12,6 +12,10 @@ describe Puppet::Util::ADSI do
     Puppet::Util::ADSI.stubs(:connect).returns connection
   end
 
+  after(:each) do
+    Puppet::Util::ADSI.instance_variable_set(:@computer_name, nil)
+  end
+
   it "should generate the correct URI for a resource" do
     Puppet::Util::ADSI.uri('test', 'user').should == "WinNT://testcomputername/test,user"
   end
@@ -24,6 +28,21 @@ describe Puppet::Util::ADSI do
     Puppet::Util::ADSI.computer_uri.should == "WinNT://testcomputername"
   end
 
+  describe ".sid_for_account" do
+    it "should return the SID" do
+      result = [stub('account', :Sid => 'S-1-1-50')]
+      connection.expects(:execquery).returns(result)
+
+      Puppet::Util::ADSI.sid_for_account('joe').should == 'S-1-1-50'
+    end
+
+    it "should return nil if the account does not exist" do
+        connection.expects(:execquery).returns([])
+
+      Puppet::Util::ADSI.sid_for_account('foobar').should be_nil
+    end
+  end
+
   describe Puppet::Util::ADSI::User do
     let(:username)  { 'testuser' }
 

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

@@ -32,5 +32,80 @@ describe Puppet::Util::Log.desttypes[:file] do
   it "should default to autoflush false" do
     @class.new('/tmp/log').autoflush.should == false
   end
+
+  describe "when matching" do
+    shared_examples_for "file destination" do
+      it "should match an absolute path" do
+        @class.match?(abspath).should be_true
+      end
+
+      it "should not match a relative path" do
+        @class.match?(relpath).should be_false
+      end
+    end
+
+    describe "on POSIX systems" do
+      before :each do Puppet.features.stubs(:microsoft_windows?).returns false end
+
+      let (:abspath) { '/tmp/log' }
+      let (:relpath) { 'log' }
+
+      it_behaves_like "file destination"
+    end
+
+    describe "on Windows systems" do
+      before :each do Puppet.features.stubs(:microsoft_windows?).returns true end
+
+      let (:abspath) { 'C:\\temp\\log.txt' }
+      let (:relpath) { 'log.txt' }
+
+      it_behaves_like "file destination"
+    end
+  end
+end
+
+describe Puppet::Util::Log.desttypes[:syslog] do
+  let (:klass) { Puppet::Util::Log.desttypes[:syslog] }
+
+  # these tests can only be run when syslog is present, because
+  # we can't stub the top-level Syslog module
+  describe "when syslog is available", :if => Puppet.features.syslog? do
+    before :each do
+      Syslog.stubs(:opened?).returns(false)
+      Syslog.stubs(:const_get).returns("LOG_KERN").returns(0)
+      Syslog.stubs(:open)
+    end
+
+    it "should open syslog" do
+      Syslog.expects(:open)
+
+      klass.new
+    end
+
+    it "should close syslog" do
+      Syslog.expects(:close)
+
+      dest = klass.new
+      dest.close
+    end
+
+    it "should send messages to syslog" do
+      syslog = mock 'syslog'
+      syslog.expects(:info).with("don't panic")
+      Syslog.stubs(:open).returns(syslog)
+
+      msg = Puppet::Util::Log.new(:level => :info, :message => "don't panic")
+      dest = klass.new
+      dest.handle(msg)
+    end
+  end
+
+  describe "when syslog is unavailable" do
+    it "should not be a suitable log destination" do
+      Puppet.features.stubs(:syslog?).returns(false)
+
+      klass.suitable?(:syslog).should be_false
+    end
+  end
 end
 

data/spec/unit/util/log_spec.rb

@@ -50,6 +50,12 @@ describe Puppet::Util::Log do
     end
   end
 
+  describe Puppet::Util::Log::DestSyslog do
+    before do
+      @syslog = Puppet::Util::Log::DestSyslog.new
+    end
+  end
+
   describe "instances" do
     before do
       Puppet::Util::Log.stubs(:newmessage)
@@ -167,6 +173,15 @@ describe Puppet::Util::Log do
       report.should be_include(log.time.to_s)
     end
 
+    it "should not create unsuitable log destinations" do
+      Puppet.features.stubs(:syslog?).returns(false)
+
+      Puppet::Util::Log::DestSyslog.expects(:suitable?)
+      Puppet::Util::Log::DestSyslog.expects(:new).never
+
+      Puppet::Util::Log.newdestination(:syslog)
+    end
+
     describe "when setting the source as a RAL object" do
       it "should tag itself with any tags the source has" do
         source = Puppet::Type.type(:file).new :path => make_absolute("/foo/bar")

data/spec/unit/util/network_device/config_spec.rb

@@ -78,6 +78,13 @@ describe Puppet::Util::NetworkDevice::Config do
       lambda { @config.read }.should raise_error
     end
 
+    it "should accept device certname containing dashes" do
+      @fd.stubs(:each).yields('[router-1.puppetlabs.com]')
+
+      @config.read
+      @config.devices.should include('router-1.puppetlabs.com')
+    end
+
     it "should create a new device for each found device line" do
       @fd.stubs(:each).multiple_yields('[router.puppetlabs.com]', '[swith.puppetlabs.com]')
 

data/spec/unit/util/settings_spec.rb

@@ -131,6 +131,16 @@ describe Puppet::Util::Settings do
       @settings[:myval].should == ""
     end
 
+    it "should flag settings from the CLI" do
+      @settings.handlearg("--myval")
+      @settings.setting(:myval).setbycli.should be_true
+    end
+
+    it "should not flag settings memory" do
+      @settings[:myval] = "12"
+      @settings.setting(:myval).setbycli.should be_false
+    end
+
     it "should clear the cache when setting getopt-specific values" do
       @settings.setdefaults :mysection, :one => ["whah", "yay"], :two => ["$one yay", "bah"]
       @settings[:two].should == "whah yay"

data/spec/unit/util_spec.rb

@@ -3,6 +3,12 @@
 require 'spec_helper'
 
 describe Puppet::Util do
+  def process_status(exitstatus)
+    return exitstatus if Puppet.features.microsoft_windows?
+
+    stub('child_status', :exitstatus => exitstatus)
+  end
+
   describe "#absolute_path?" do
     it "should default to the platform of the local system" do
       Puppet.features.stubs(:posix?).returns(true)
@@ -19,13 +25,13 @@ describe Puppet::Util do
     end
 
     describe "when using platform :posix" do
-      %w[/ /foo /foo/../bar //foo //Server/Foo/Bar //?/C:/foo/bar /\Server/Foo].each do |path|
+      %w[/ /foo /foo/../bar //foo //Server/Foo/Bar //?/C:/foo/bar /\Server/Foo /foo//bar/baz].each do |path|
         it "should return true for #{path}" do
           Puppet::Util.should be_absolute_path(path, :posix)
         end
       end
 
-      %w[. ./foo \foo C:/foo \\Server\Foo\Bar \\?\C:\foo\bar \/?/foo\bar \/Server/foo].each do |path|
+      %w[. ./foo \foo C:/foo \\Server\Foo\Bar \\?\C:\foo\bar \/?/foo\bar \/Server/foo foo//bar/baz].each do |path|
         it "should return false for #{path}" do
           Puppet::Util.should_not be_absolute_path(path, :posix)
         end
@@ -33,13 +39,13 @@ describe Puppet::Util do
     end
 
     describe "when using platform :windows" do
-      %w[C:/foo C:\foo \\\\Server\Foo\Bar \\\\?\C:\foo\bar //Server/Foo/Bar //?/C:/foo/bar /\?\C:/foo\bar \/Server\Foo/Bar].each do |path|
+      %w[C:/foo C:\foo \\\\Server\Foo\Bar \\\\?\C:\foo\bar //Server/Foo/Bar //?/C:/foo/bar /\?\C:/foo\bar \/Server\Foo/Bar c:/foo//bar//baz].each do |path|
         it "should return true for #{path}" do
           Puppet::Util.should be_absolute_path(path, :windows)
         end
       end
 
-      %w[/ . ./foo \foo /foo /foo/../bar //foo C:foo/bar].each do |path|
+      %w[/ . ./foo \foo /foo /foo/../bar //foo C:foo/bar foo//bar/baz].each do |path|
         it "should return false for #{path}" do
           Puppet::Util.should_not be_absolute_path(path, :windows)
         end
@@ -47,6 +53,108 @@ describe Puppet::Util do
     end
   end
 
+  describe "#path_to_uri" do
+    %w[. .. foo foo/bar foo/../bar].each do |path|
+      it "should reject relative path: #{path}" do
+        lambda { Puppet::Util.path_to_uri(path) }.should raise_error(Puppet::Error)
+      end
+    end
+
+    it "should perform URI escaping" do
+      Puppet::Util.path_to_uri("/foo bar").path.should == "/foo%20bar"
+    end
+
+    describe "when using platform :posix" do
+      before :each do
+        Puppet.features.stubs(:posix).returns true
+        Puppet.features.stubs(:microsoft_windows?).returns false
+      end
+
+      %w[/ /foo /foo/../bar].each do |path|
+        it "should convert #{path} to URI" do
+          Puppet::Util.path_to_uri(path).path.should == path
+        end
+      end
+    end
+
+    describe "when using platform :windows" do
+      before :each do
+        Puppet.features.stubs(:posix).returns false
+        Puppet.features.stubs(:microsoft_windows?).returns true
+      end
+
+      it "should normalize backslashes" do
+        Puppet::Util.path_to_uri('c:\\foo\\bar\\baz').path.should == '/' + 'c:/foo/bar/baz'
+      end
+
+      %w[C:/ C:/foo/bar].each do |path|
+        it "should convert #{path} to absolute URI" do
+          Puppet::Util.path_to_uri(path).path.should == '/' + path
+        end
+      end
+
+      %w[share C$].each do |path|
+        it "should convert UNC #{path} to absolute URI" do
+          uri = Puppet::Util.path_to_uri("\\\\server\\#{path}")
+          uri.host.should == 'server'
+          uri.path.should == '/' + path
+        end
+      end
+    end
+  end
+
+  describe ".uri_to_path" do
+    require 'uri'
+
+    it "should strip host component" do
+      Puppet::Util.uri_to_path(URI.parse('http://foo/bar')).should == '/bar'
+    end
+
+    it "should accept puppet URLs" do
+      Puppet::Util.uri_to_path(URI.parse('puppet:///modules/foo')).should == '/modules/foo'
+    end
+
+    it "should return unencoded path" do
+      Puppet::Util.uri_to_path(URI.parse('http://foo/bar%20baz')).should == '/bar baz'
+    end
+
+    it "should be nil-safe" do
+      Puppet::Util.uri_to_path(nil).should be_nil
+    end
+
+    describe "when using platform :posix",:if => Puppet.features.posix? do
+      it "should accept root" do
+        Puppet::Util.uri_to_path(URI.parse('file:/')).should == '/'
+      end
+
+      it "should accept single slash" do
+        Puppet::Util.uri_to_path(URI.parse('file:/foo/bar')).should == '/foo/bar'
+      end
+
+      it "should accept triple slashes" do
+        Puppet::Util.uri_to_path(URI.parse('file:///foo/bar')).should == '/foo/bar'
+      end
+    end
+
+    describe "when using platform :windows", :if => Puppet.features.microsoft_windows? do
+      it "should accept root" do
+        Puppet::Util.uri_to_path(URI.parse('file:/C:/')).should == 'C:/'
+      end
+
+      it "should accept single slash" do
+        Puppet::Util.uri_to_path(URI.parse('file:/C:/foo/bar')).should == 'C:/foo/bar'
+      end
+
+      it "should accept triple slashes" do
+        Puppet::Util.uri_to_path(URI.parse('file:///C:/foo/bar')).should == 'C:/foo/bar'
+      end
+
+      it "should accept file scheme with double slashes as a UNC path" do
+        Puppet::Util.uri_to_path(URI.parse('file://host/share/file')).should == '//host/share/file'
+      end
+    end
+  end
+
   describe "execution methods" do
     let(:pid) { 5501 }
     let(:null_file) { Puppet.features.microsoft_windows? ? 'NUL' : '/dev/null' }
@@ -112,6 +220,12 @@ describe Puppet::Util do
         Puppet::Util.execute_posix(['test command', 'with', 'arguments'], {:uid => 50, :gid => 55}, @stdin, @stdout, @stderr)
       end
 
+      it "should properly execute string commands with embedded newlines" do
+        Kernel.expects(:exec).with("/bin/echo 'foo' ; \n /bin/echo 'bar' ;")
+
+        Puppet::Util.execute_posix("/bin/echo 'foo' ; \n /bin/echo 'bar' ;", {:uid => 50, :gid => 55}, @stdin, @stdout, @stderr)
+      end
+
       it "should return the pid of the child process" do
         Puppet::Util.execute_posix('test command', {}, @stdin, @stdout, @stderr).should == pid
       end
@@ -122,7 +236,7 @@ describe Puppet::Util do
 
       before :each do
         Process.stubs(:create).returns(proc_info_stub)
-        Process.stubs(:waitpid2).with(pid).returns([pid, 0])
+        Process.stubs(:waitpid2).with(pid).returns([pid, process_status(0)])
 
         @stdin  = File.open(null_file, 'r')
         @stdout = Tempfile.new('stdout')
@@ -153,7 +267,7 @@ describe Puppet::Util do
 
     describe "#execute" do
       before :each do
-        Process.stubs(:waitpid2).with(pid).returns([pid, 0])
+        Process.stubs(:waitpid2).with(pid).returns([pid, process_status(0)])
       end
 
       describe "when an execution stub is specified" do
@@ -251,8 +365,9 @@ describe Puppet::Util do
 
     describe "after execution" do
       let(:executor) { Puppet.features.microsoft_windows? ? 'execute_windows' : 'execute_posix' }
+
       before :each do
-        Process.stubs(:waitpid2).with(pid).returns([pid, 0])
+        Process.stubs(:waitpid2).with(pid).returns([pid, process_status(0)])
 
         Puppet::Util.stubs(executor).returns(pid)
       end
@@ -260,7 +375,7 @@ describe Puppet::Util do
       it "should wait for the child process to exit" do
         Puppet::Util.stubs(:wait_for_output)
 
-        Process.expects(:waitpid2).with(pid).returns([pid, 0])
+        Process.expects(:waitpid2).with(pid).returns([pid, process_status(0)])
 
         Puppet::Util.execute('test command')
       end
@@ -306,9 +421,7 @@ describe Puppet::Util do
       end
 
       it "should raise an error if failonfail is true and the child failed" do
-        child_status = stub('child_status', :exitstatus => 1)
-
-        Process.expects(:waitpid2).with(pid).returns([pid, child_status])
+        Process.expects(:waitpid2).with(pid).returns([pid, process_status(1)])
 
         expect {
           Puppet::Util.execute('fail command', :failonfail => true)
@@ -316,7 +429,7 @@ describe Puppet::Util do
       end
 
       it "should not raise an error if failonfail is false and the child failed" do
-        Process.expects(:waitpid2).with(pid).returns([pid, 1])
+        Process.expects(:waitpid2).with(pid).returns([pid, process_status(1)])
 
         expect {
           Puppet::Util.execute('fail command', :failonfail => false)
@@ -324,7 +437,7 @@ describe Puppet::Util do
       end
 
       it "should not raise an error if failonfail is true and the child succeeded" do
-        Process.expects(:waitpid2).with(pid).returns([pid, 0])
+        Process.expects(:waitpid2).with(pid).returns([pid, process_status(0)])
 
         expect {
           Puppet::Util.execute('fail command', :failonfail => true)

data/test/language/functions.rb

@@ -4,7 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/parser/parser'
-require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/resourcetesting'
 

data/test/language/snippets.rb

@@ -4,8 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/parser/parser'
-require 'puppet/network/client'
-require 'puppet/network/handler'
 require 'puppettest'
 
 class TestSnippets < Test::Unit::TestCase
@@ -69,13 +67,6 @@ class TestSnippets < Test::Unit::TestCase
     ast
   end
 
-  def client
-    args = {
-      :Listen => false
-    }
-    Puppet::Network::Client.new(args)
-  end
-
   def ast2scope(ast)
     scope = Puppet::Parser::Scope.new
     ast.evaluate(scope)