diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Rakefile | 7 | ||||
| -rwxr-xr-x | test/lib/puppettest.rb | 3 | ||||
| -rwxr-xr-x | test/network/client/resource.rb | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/test/Rakefile b/test/Rakefile index a8118c1c5..a1f8c26ec 100644 --- a/test/Rakefile +++ b/test/Rakefile @@ -55,7 +55,7 @@ end desc "Run the full test suite" Rake::PuppetTestTask.new :test do |t| - t.libs << $test_library_paths + t.libs += $test_library_paths # Add every file as a test file to run t.test_files = allfiles @@ -72,7 +72,8 @@ filemap.each do |dir, files| namespace ns do files.each do |file| Rake::PuppetTestTask.new File.basename(file, '.rb').to_sym do |t| - t.libs << $test_library_paths + ['..'] + t.libs += $test_library_paths + ['..'] + t.libs << '..' t.test_files = [ file ] t.verbose = true end @@ -81,7 +82,7 @@ filemap.each do |dir, files| # Then create a task that matches the directory itself. Rake::PuppetTestTask.new dir do |t| - t.libs << $test_library_paths + t.libs += $test_library_paths if ENV["TESTFILES"] t.test_files = ENV["TESTFILES"].split(/\s+/) else diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 3c6083fa6..2f84a6c28 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -166,6 +166,9 @@ module PuppetTest end def setup + unless ENV["PATH"].split(File::PATH_SEPARATOR).include?("/usr/sbin") + ENV["PATH"] += File::PATH_SEPARATOR + "/usr/sbin" + end @memoryatstart = Puppet::Util.memory if defined? @@testcount @@testcount += 1 diff --git a/test/network/client/resource.rb b/test/network/client/resource.rb index ba84fc27e..c73690170 100755 --- a/test/network/client/resource.rb +++ b/test/network/client/resource.rb @@ -42,10 +42,7 @@ class TestResourceClient < Test::Unit::TestCase assert_instance_of(Puppet::TransObject, tresource) resource = tresource.to_ral - assert_events([], resource) - File.unlink(file) - assert_events([:file_created], resource) - File.unlink(file) + assert_equal(File.stat(file).mode & 007777, resource[:mode], "Did not get mode") # Now test applying result = client.apply(tresource) |