Skip some importlib tests on windows + fix weird errors, hopefully?

coolreader18 · coolreader18 · commit 606d8196b623 · 2020-11-02T12:42:44.000-06:00
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -43,7 +43,10 @@
 )
 
 def _ignore_error(exception):
-    return (getattr(exception, 'errno', None) in _IGNORED_ERROS or
+    # XXX RUSTPYTHON: added check for FileNotFoundError, file.exists() on windows throws it
+    # but with a errno==ESRCH for some reason
+    return (isinstance(exception, FileNotFoundError) or
+            getattr(exception, 'errno', None) in _IGNORED_ERROS or
             getattr(exception, 'winerror', None) in _IGNORED_WINERRORS)
 
 
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -1066,12 +1066,15 @@ def temp_dir(path=None, quiet=False):
             try:
                 rmtree(path)
             except OSError as exc:
-                # XXX RUSTPYTHON: added quiet check here, not sure why rmtree fails on windows
-                if not quiet:
-                    raise
-                warnings.warn(f'unable to remove temporary'
-                              f'directory {path!r}: {exc}',
-                              RuntimeWarning, stacklevel=3)
+                # XXX RUSTPYTHON: something something async file removal?
+                #                 also part of the thing with rmtree()
+                #                 throwing PermissionError, I think
+                if os.path.exists(path):
+                    if not quiet:
+                        raise
+                    warnings.warn(f'unable to remove temporary'
+                                  f'directory {path!r}: {exc}',
+                                  RuntimeWarning, stacklevel=3)
 
 @contextlib.contextmanager
 def change_cwd(path, quiet=False):
diff --git a/Lib/test/test_importlib/test_windows.py b/Lib/test/test_importlib/test_windows.py
@@ -88,6 +88,8 @@ def test_module_not_found(self):
 
 @unittest.skipUnless(sys.platform.startswith('win'), 'requires Windows')
 class WindowsExtensionSuffixTests:
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_tagged_suffix(self):
         suffixes = self.machinery.EXTENSION_SUFFIXES
         expected_tag = ".cp{0.major}{0.minor}-{1}.pyd".format(sys.version_info,

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,10 @@`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`def _ignore_error(exception):`
`46`		`- return (getattr(exception, 'errno', None) in _IGNORED_ERROS or`
	`46`	`+ # XXX RUSTPYTHON: added check for FileNotFoundError, file.exists() on windows throws it`
	`47`	`+ # but with a errno==ESRCH for some reason`
	`48`	`+ return (isinstance(exception, FileNotFoundError) or`
	`49`	`+ getattr(exception, 'errno', None) in _IGNORED_ERROS or`
`47`	`50`	`getattr(exception, 'winerror', None) in _IGNORED_WINERRORS)`
`48`	`51`
`49`	`52`