diff options
| author | shafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-14 04:23:43 +0000 |
|---|---|---|
| committer | shafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-14 04:23:43 +0000 |
| commit | 5438eff0f2d69dd4a8b91cd530a5e1bec0d744ef (patch) | |
| tree | 27f9778a6b2d34cccc8416c9699b10c70abc7202 /test | |
| parent | 79961e1fb057abb76d92e8554465b7bf2a215762 (diff) | |
| download | puppet-5438eff0f2d69dd4a8b91cd530a5e1bec0d744ef.tar.gz puppet-5438eff0f2d69dd4a8b91cd530a5e1bec0d744ef.tar.xz puppet-5438eff0f2d69dd4a8b91cd530a5e1bec0d744ef.zip | |
removed comp.sync and replaced system mkdir -p
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@656 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
| -rwxr-xr-x | test/types/tc_filesources.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/types/tc_filesources.rb b/test/types/tc_filesources.rb index cb280a288..88699bcb5 100755 --- a/test/types/tc_filesources.rb +++ b/test/types/tc_filesources.rb @@ -18,6 +18,8 @@ class TestFileSources < Test::Unit::TestCase # hmmm # this is complicated, because we store references to the created # objects in a central store + +=begin def mkfile(hash) file = nil assert_nothing_raised { @@ -34,7 +36,7 @@ class TestFileSources < Test::Unit::TestCase @@tmpfiles.push tmpfile mkfile(:name => tmpfile) end - +=end def setup @@tmpfiles = [] @@tmppids = [] @@ -77,7 +79,7 @@ class TestFileSources < Test::Unit::TestCase path = "/tmp/newchilddir" @@tmpfiles.push path - system("mkdir -p #{path}") + FileUtils.mkdir_p path File.open(File.join(path,"childtest"), "w") { |of| of.puts "yayness" } @@ -106,7 +108,7 @@ class TestFileSources < Test::Unit::TestCase def test_simplelocalsource path = "/tmp/Filesourcetest" @@tmpfiles.push path - system("mkdir -p #{path}") + FileUtils.mkdir_p path frompath = File.join(path,"source") topath = File.join(path,"dest") fromfile = nil @@ -132,9 +134,10 @@ class TestFileSources < Test::Unit::TestCase assert_nothing_raised { trans.evaluate } - assert_nothing_raised { - comp.sync - } + # assert_nothing_raised { + # comp.sync + # } + assert(FileTest.exists?(topath)) from = File.open(frompath) { |o| o.read } to = File.open(topath) { |o| o.read } @@ -179,7 +182,7 @@ class TestFileSources < Test::Unit::TestCase @@tmpfiles.push path # first create the source directory - system("mkdir -p #{path}") + FileUtils.mkdir_p path # okay, let's create a directory structure |