2 files changed, 14 insertions, 13 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)
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 480ef548c..1c50c10b2 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -14,6 +14,7 @@ prevdir = Dir.pwd
 tmproot = TestFileUtils::TMPROOT
 Dir.mkdir tmproot unless File.directory?(tmproot)
 Dir.chdir tmproot
+p tmproot
 
 def have_drive_letter?
   /djgpp|mswin(?!ce)|mingw|bcc|emx/ =~ RUBY_PLATFORM
@@ -76,10 +77,15 @@ class TestFileUtils
     end
   end
 
+  def mymkdir(path)
+    Dir.mkdir path
+    File.chown nil, Process.gid, path if have_file_perm?
+  end
+
   def setup
     @prevdir = Dir.pwd
     tmproot = TMPROOT
-    Dir.mkdir tmproot unless File.directory?(tmproot)
+    mymkdir tmproot unless File.directory?(tmproot)
     Dir.chdir tmproot
     my_rm_rf 'data'; Dir.mkdir 'data'
     my_rm_rf 'tmp';  Dir.mkdir 'tmp'