From 0c16426a772c85b0ab45bfd4c3ba5189ace2d6b2 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sat, 28 Feb 2009 07:55:56 +0000 Subject: Fixing broken 0.24.x tests in test/. These tests once again largely were caused by /usr/sbin not being in the path and by ~ not being writable. The only tests still failing are Rails tests, and my guess is that they're all failing because of the recent work by Brice. They should probably just be removed. Signed-off-by: Luke Kanies --- test/executables/filebucket.rb | 9 ++++++--- test/executables/puppetbin.rb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'test/executables') diff --git a/test/executables/filebucket.rb b/test/executables/filebucket.rb index 491630707..f479c150e 100755 --- a/test/executables/filebucket.rb +++ b/test/executables/filebucket.rb @@ -12,12 +12,15 @@ class TestFileBucketExe < Test::Unit::TestCase include PuppetTest::ExeTest def test_local + basedir = tempfile() + FileUtils.mkdir_p(basedir) + bucket = tempfile file = tempfile text = "somet ext" md5 = Digest::MD5.hexdigest(text) File.open(file, "w") { |f| f.print text } - out = %x{filebucket --bucket #{bucket} backup #{file}} + out = %x{filebucket --confdir #{basedir} --vardir #{basedir} --bucket #{bucket} backup #{file}} outfile, outmd5 = out.chomp.split(": ") @@ -35,12 +38,12 @@ class TestFileBucketExe < Test::Unit::TestCase assert_equal(text, newtext, "did not get correct file from md5 sum") - out = %x{filebucket --bucket #{bucket} get #{md5}} + out = %x{filebucket --confdir #{basedir} --vardir #{basedir} --bucket #{bucket} get #{md5}} assert_equal(0, $?, "filebucket did not run successfully") assert_equal(text, out, "did not get correct text back from filebucket") File.open(file, "w") { |f| f.puts "some other txt" } - out = %x{filebucket --bucket #{bucket} restore #{file} #{md5}} + out = %x{filebucket --confdir #{basedir} --vardir #{basedir} --bucket #{bucket} restore #{file} #{md5}} assert_equal(0, $?, "filebucket did not run successfully") assert_equal(text, File.read(file), "file was not restored") end diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb index 08329efb6..631b3b22a 100755 --- a/test/executables/puppetbin.rb +++ b/test/executables/puppetbin.rb @@ -72,7 +72,7 @@ class TestPuppetBin < Test::Unit::TestCase end File.open(manifest, "w") do |f| f.puts "#!#{env} puppet - file { '#{path}': ensure => file }" + exec { '/bin/touch #{path}': }" end File.chmod(0755, manifest) -- cgit