Windows tests fixes

Author: barneygale

Lib/test/test_pathlib/test_pathlib.py

@@ -2572,10 +2572,13 @@ def test_info_mode_caching(self):
         self.assertEqual(q.info.mode(), mode)
         new_mode = mode & ~0o222  # clear writable bit.
         os.chmod(q, new_mode)
-        self.assertEqual(q.info.mode(), mode)
+        try:
+            self.assertEqual(q.info.mode(), mode)
 
-        q = p / 'myfile'  # same path, new instance.
-        self.assertEqual(q.info.mode(), new_mode)
+            q = p / 'myfile'  # same path, new instance.
+            self.assertEqual(q.info.mode(), new_mode)
+        finally:
+            os.chmod(q, mode)
         os.unlink(q)
         self.assertEqual(q.info.mode(), new_mode)
 

Lib/test/test_pathlib/test_read.py

@@ -337,14 +337,15 @@ def test_info_mode(self):
         self.assertEqual(p.joinpath('dirA').info.mode(), dir_mode)
         self.assertRaises(FileNotFoundError, p.joinpath('non-existing').info.mode)
         if self.ground.can_symlink:
-            link_mode = self.ground.getmode(p.joinpath('linkA'))
-            self.assertEqual(p.joinpath('linkA').info.mode(follow_symlinks=False), link_mode)
+            file_link_mode = self.ground.getmode(p.joinpath('linkA'))
+            dir_link_mode = self.ground.getmode(p.joinpath('linkB'))
+            self.assertEqual(p.joinpath('linkA').info.mode(follow_symlinks=False), file_link_mode)
             self.assertEqual(p.joinpath('linkA').info.mode(), file_mode)
-            self.assertEqual(p.joinpath('linkB').info.mode(follow_symlinks=False), link_mode)
+            self.assertEqual(p.joinpath('linkB').info.mode(follow_symlinks=False), dir_link_mode)
             self.assertEqual(p.joinpath('linkB').info.mode(), dir_mode)
-            self.assertEqual(p.joinpath('brokenLink').info.mode(follow_symlinks=False), link_mode)
+            self.assertEqual(p.joinpath('brokenLink').info.mode(follow_symlinks=False), file_link_mode)
             self.assertRaises(FileNotFoundError, p.joinpath('brokenLink').info.mode)
-            self.assertEqual(p.joinpath('brokenLinkLoop').info.mode(follow_symlinks=False), link_mode)
+            self.assertEqual(p.joinpath('brokenLinkLoop').info.mode(follow_symlinks=False), file_link_mode)
             self.assertRaises(OSError, p.joinpath('brokenLinkLoop').info.mode)