Merge lp:~luoyonggang/subvertpy/unittest-win32 into lp:~jelmer/subvertpy/trunk

[Yonggang Luo]

A step to get unittest passed under win32. About the wrong file URL and can not remove read only files properly.

[Jelmer Vernooij (jelmer)]

Do you know what creates these read-only files, and what files they are?

[Jelmer Vernooij (jelmer)]

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

review: Needs Information

[Yonggang Luo (luoyonggang)]

Information is already there,
At this URL

https://bugs.launchpad.net/subvertpy/+bug/943131

2012/2/29 Jelmer Vernooij <email address hidden>

> Review: Needs Information
>
>
> --
>
> https://code.launchpad.net/~luoyonggang/subvertpy/unittest-win32/+merge/95141
> You are the owner of lp:~luoyonggang/subvertpy/unittest-win32.
>

--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[Yonggang Luo (luoyonggang)]

It's subversion get those files be read only.
That's make sense because those won't be modified except svn. So they
were set to be read only. But on windows, we can not remove read only
files directly.

2012/2/29, Jelmer Vernooij <email address hidden>:
> Do you know what creates these read-only files, and what files they are?
> --
> https://code.launchpad.net/~luoyonggang/subvertpy/unittest-win32/+merge/95141
> You are the owner of lp:~luoyonggang/subvertpy/unittest-win32.
>

--
从我的移动设备发送

         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[lp:~luoyonggang/subvertpy/unittest-win32]

2435. By Jelmer Vernooij on 2012-02-29

Only use build_with_dlls on windows.

2436. By Jelmer Vernooij on 2012-03-01

Merge support for always closing files, with tweaks.

[Jelmer Vernooij (jelmer)]

review: Approve

[lp:~luoyonggang/subvertpy/unittest-win32]

2437. By Jelmer Vernooij on 2012-03-01

Merge fix to remove readonly files on Windows.

=== modified file 'subvertpy/tests/__init__.py'
--- subvertpy/tests/__init__.py	2011-11-08 14:41:55 +0000
+++ subvertpy/tests/__init__.py	2012-02-29 10:23:18 +0000
@@ -22,6 +22,7 @@
 from cStringIO import StringIO
 import os
 import shutil
+import stat
 import sys
 import tempfile
 import unittest
@@ -48,6 +49,22 @@
     )
 
 
+def force_rm_handle(remove_path, path, excinfo):
+    os.chmod(
+        path,
+        os.stat(path).st_mode | stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH
+    )
+    remove_path(path)
+
+
+def rmtree(path):
+    """In Windows a read-only file cannot be removed, and shutil.rmtree fails.
+    So we implement our own version of rmtree to address this issue.
+    """
+    if os.path.exists(path):
+        shutil.rmtree(path, onerror=lambda func, path, e: force_rm_handle(func, path, e))
+
+
 class TestCase(unittest.TestCase):
     """Base test case.
 
@@ -81,7 +98,7 @@
     def tearDown(self):
         TestCase.tearDown(self)
         os.chdir(self._oldcwd)
-        shutil.rmtree(self.test_dir)
+        rmtree(self.test_dir)
 
 
 class TestFileEditor(object):
@@ -230,7 +247,7 @@
                 os.chmod(revprop_hook, os.stat(revprop_hook).st_mode | 0111)
 
         if sys.platform == 'win32':
-            return "file://%s" % abspath.replace("\\", "/")
+            return "file:///%s" % abspath.replace("\\", "/")
         else:
             return "file://%s" % abspath