* test/fileutils/test_fileutils.rb (setup): support BSD-style directory group inheritance. (backport from HEAD, rev 1.32)

* test/fileutils/fileasserts.rb (assert_same_entry): show entry difference. (backport from HEAD, rev 1.4)


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 12 deletions

diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb
index ea0353454..c2e9244a9 100644
--- a/test/fileutils/fileasserts.rb
+++ b/test/fileutils/fileasserts.rb
@@ -13,18 +13,13 @@ module Test
       end
 
       def assert_same_entry(from, to)
-        _wrap_assertion {
-          assert_block("entry #{from} != #{to}") {
-            a = File.stat(from)
-            b = File.stat(to)
-
-            a.mode == b.mode and
-            #a.atime == b.atime and
-            a.mtime == b.mtime and
-            a.uid == b.uid and
-            a.gid == b.gid
-          }
-        }
+        a = File.stat(from)
+        b = File.stat(to)
+        assert_equal a.mode, b.mode, "mode #{a.mode} != #{b.mode}"
+        #assert_equal a.atime, b.atime
+        assert_equal a.mtime, b.mtime, "mtime #{a.mtime} != #{b.mtime}"
+        assert_equal a.uid, b.uid, "uid #{a.uid} != #{b.uid}"
+        assert_equal a.gid, b.gid, "gid #{a.gid} != #{b.gid}"
       end
 
       def assert_file_exist(path)