diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-29 13:27:39 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-29 13:27:39 -0600 |
| commit | ba803a1fb8190997f277b83d50c531b446b2a67f (patch) | |
| tree | 1e8bb91ed20fd1385c63cff8d5aa77db7eb1f68d /test | |
| parent | ba2814cb9b769c356416228f4fb7355ae8d67d99 (diff) | |
| parent | f79cf375bf4a601662cbd0435200bc8ab6644aeb (diff) | |
| download | puppet-ba803a1fb8190997f277b83d50c531b446b2a67f.tar.gz puppet-ba803a1fb8190997f277b83d50c531b446b2a67f.tar.xz puppet-ba803a1fb8190997f277b83d50c531b446b2a67f.zip | |
Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x
Diffstat (limited to 'test')
| -rwxr-xr-x | test/ral/type/file.rb | 6 | ||||
| -rwxr-xr-x | test/ral/type/tidy.rb | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb index cbbe818ae..5cf989aa3 100755 --- a/test/ral/type/file.rb +++ b/test/ral/type/file.rb @@ -185,12 +185,6 @@ class TestFile < Test::Unit::TestCase initgroup = File.stat(file).gid obj[:group] = group.name - assert_events([:file_changed], obj) - assert_equal(initgroup, File.stat(file).gid) - assert_equal(group.gid, File.lstat(link).gid) - File.chown(nil, initgroup, file) - File.lchown(nil, initgroup, link) - obj[:links] = :follow assert_events([:file_changed], obj) assert_equal(group.gid, File.stat(file).gid) diff --git a/test/ral/type/tidy.rb b/test/ral/type/tidy.rb index 60fad6516..17f98df22 100755 --- a/test/ral/type/tidy.rb +++ b/test/ral/type/tidy.rb @@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/support/utils' +require 'puppet/type/tidy' class TestTidy < Test::Unit::TestCase include PuppetTest::Support::Utils |