diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index d306c91d4..f78204555 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -3,8 +3,6 @@ import logging import os import stat - -from unittest import SkipTest import uuid import git @@ -934,6 +932,7 @@ def remove(self, module: bool = True, force: bool = False, rmtree(str(wtd)) except Exception as ex: if HIDE_WINDOWS_KNOWN_ERRORS: + from unittest import SkipTest raise SkipTest("FIXME: fails with: PermissionError\n {}".format(ex)) from ex raise # END delete tree if possible @@ -945,6 +944,7 @@ def remove(self, module: bool = True, force: bool = False, rmtree(git_dir) except Exception as ex: if HIDE_WINDOWS_KNOWN_ERRORS: + from unittest import SkipTest raise SkipTest(f"FIXME: fails with: PermissionError\n {ex}") from ex else: raise diff --git a/git/util.py b/git/util.py index b81332ea4..6e6f09557 100644 --- a/git/util.py +++ b/git/util.py @@ -20,7 +20,6 @@ import stat from sys import maxsize import time -from unittest import SkipTest from urllib.parse import urlsplit, urlunsplit import warnings @@ -130,6 +129,7 @@ def onerror(func: Callable, path: PathLike, exc_info: str) -> None: func(path) # Will scream if still not possible to delete. except Exception as ex: if HIDE_WINDOWS_KNOWN_ERRORS: + from unittest import SkipTest raise SkipTest("FIXME: fails with: PermissionError\n {}".format(ex)) from ex raise