Fix test bug that assumed staticmethod callability

staticmethod objects are descriptors that cause the same-named attribute on a class or its instances to be callable (and the first argument, representing a class or instance, not to be passed). But the actual staticmethod objects themselves are only callable starting in Python 3.10. This reorgnizes the just-added test code so it no longer wrongly relies on being able to call such objects.

Author: EliahKagan

test/test_util.py

@@ -80,6 +80,30 @@ def __repr__(self):
 return"TestIterableMember(%r)"%self.name
 
 
+@contextlib.contextmanager
+def_tmpdir_to_force_permission_error():
+"""Context manager to test permission errors in situations where we do not fix them."""
+ifsys.platform=="cygwin":
+raiseSkipTest("Cygwin can't set the permissions that make the test meaningful.")
+ifsys.version_info< (3, 8):
+raiseSkipTest("In 3.7, TemporaryDirectory doesn't clean up after weird permissions.")
+
+withtempfile.TemporaryDirectory() asparent:
+td=pathlib.Path(parent, "testdir")
+td.mkdir()
+ (td/"x").write_bytes(b"")
+ (td/"x").chmod(stat.S_IRUSR) # Set up PermissionError on Windows.
+td.chmod(stat.S_IRUSR|stat.S_IXUSR) # Set up PermissionError on Unix.
+yieldtd
+
+
+@contextlib.contextmanager
+def_tmpdir_for_file_not_found():
+"""Context manager to test errors deleting a directory that are not due to permissions."""
+withtempfile.TemporaryDirectory() asparent:
+yieldpathlib.Path(parent, "testdir") # It is deliberately never created.
+
+
 @ddt.ddt
 classTestUtils(TestBase):
 defsetup(self):
@@ -107,6 +131,7 @@ def test_rmtree_deletes_nested_dir_with_files(self):
 @skipIf(sys.platform=="cygwin", "Cygwin can't set the permissions that make the test meaningful.")
 deftest_rmtree_deletes_dir_with_readonly_files(self):
 # Automatically works on Unix, but requires special handling on Windows.
+# Not to be confused with _tmpdir_to_force_permission_error (which is used below).
 withtempfile.TemporaryDirectory() asparent:
 td=pathlib.Path(parent, "testdir")
 fordintd, td/"sub":
@@ -122,31 +147,9 @@ def test_rmtree_deletes_dir_with_readonly_files(self):
 
 self.assertFalse(td.exists())
 
-@staticmethod
-@contextlib.contextmanager
-def_tmpdir_to_force_permission_error():
-ifsys.platform=="cygwin":
-raiseSkipTest("Cygwin can't set the permissions that make the test meaningful.")
-ifsys.version_info< (3, 8):
-raiseSkipTest("In 3.7, TemporaryDirectory doesn't clean up after weird permissions.")
-
-withtempfile.TemporaryDirectory() asparent:
-td=pathlib.Path(parent, "testdir")
-td.mkdir()
- (td/"x").write_bytes(b"")
- (td/"x").chmod(stat.S_IRUSR) # Set up PermissionError on Windows.
-td.chmod(stat.S_IRUSR|stat.S_IXUSR) # Set up PermissionError on Unix.
-yieldtd
-
-@staticmethod
-@contextlib.contextmanager
-def_tmpdir_for_file_not_found():
-withtempfile.TemporaryDirectory() asparent:
-yieldpathlib.Path(parent, "testdir") # It is deliberately never created.
-
 deftest_rmtree_can_wrap_exceptions(self):
 """Our rmtree wraps PermissionError when HIDE_WINDOWS_KNOWN_ERRORS is true."""
-withself._tmpdir_to_force_permission_error() astd:
+with_tmpdir_to_force_permission_error() astd:
 # Access the module through sys.modules so it is unambiguous which module's
 # attribute we patch: the original git.util, not git.index.util even though
 # git.index.util "replaces" git.util and is what "import git.util" gives us.