dsyzling avatar dsyzling committed 8eb4e9c

testutils: fix remove_recursively() on windows

Comments (0)

Files changed (1)

ropetest/testutils.py

     import time
     # windows sometimes raises exceptions instead of removing files
     if os.name == 'nt' or sys.platform == 'cygwin':
-        exception = OSError
-        if os.name == 'nt':
-            exception = WindowsError
-        for i in range(12):
+          for i in range(12):
             try:
                 _remove_recursively(path)
-            except exception, e:
-                if isinstance(e, OSError) and e.errno in (13, 16):
+            except OSError, e:
+                if e.errno not in (13, 16, 32):
                     raise
                 time.sleep(0.3)
             else:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.