diff options
| -rwxr-xr-x | lib/puppet/daemon.rb | 1 | ||||
| -rwxr-xr-x | lib/puppet/provider/package/rpm.rb | 2 | ||||
| -rwxr-xr-x | test/types/file.rb | 7 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index 887992640..661c25947 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -1,6 +1,7 @@ # helper functions for daemons require 'puppet' +require 'puppet/util/pidlock' module Puppet # A module that handles operations common to all daemons. This is included diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb index cda70d10a..a3bd3e897 100755 --- a/lib/puppet/provider/package/rpm.rb +++ b/lib/puppet/provider/package/rpm.rb @@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :rpm do :description => "DESCRIPTION" } - cmd = ["-q", @model[:name], "--qf", '%{NAME} #{VERSIONSTRING}\n'] + cmd = ["-q", @model[:name], "--qf", "%{NAME} #{VERSIONSTRING}\n"] begin output = rpm *cmd diff --git a/test/types/file.rb b/test/types/file.rb index cebdac636..80e2563d8 100755 --- a/test/types/file.rb +++ b/test/types/file.rb @@ -529,7 +529,8 @@ class TestFile < Test::Unit::TestCase File.open(f, "w") do |o| o.puts "" end end assert_nothing_raised() { ret = dir.localrecurse(true) } - assert_equal(files.sort, ret.collect { |f| f.title }, "child object was returned twice") + assert_equal(files.sort, ret.collect { |f| f.title }.sort, + "child object was returned twice") # Clean everything up and start over files << test @@ -801,7 +802,7 @@ class TestFile < Test::Unit::TestCase assert(file, "Could not retrieve file object") - assert_equal("file=%s" % file.title, file.path) + assert_equal("/%s" % file.ref, file.path) end def test_autorequire @@ -1133,7 +1134,7 @@ class TestFile < Test::Unit::TestCase end assert_nothing_raised { ret = link.linkrecurse(true) } - assert_equal(returns.sort, ret.collect { |f| f.title }, + assert_equal(returns.sort, ret.collect { |f| f.title }.sort, "Did not get links back") returns.each do |path| |