Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace xfail with gc.collect in TestSubmodule.test_rename #1767

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Replace xfail with gc.collect in TestSubmodule.test_rename #1767

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f62df52
Remove TestSubmodule.test_rename xfail mark
EliahKagan Dec 12, 2023
b66be7c
Replace xfail with gc.collect in TestSubmodule.test_rename
EliahKagan Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions test/test_submodule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,18 +948,6 @@ def test_remove_norefs(self, rwdir):
sm.remove()
assert not sm.exists()

@pytest.mark.xfail(
os.name == "nt" and sys.version_info >= (3, 12),
reason=(
"The sm.move call fails. Submodule.move calls os.renames, which raises:\n"
"PermissionError: [WinError 32] "
"The process cannot access the file because it is being used by another process: "
R"'C:\Users\ek\AppData\Local\Temp\test_renamekkbznwjp\parent\mymodules\myname' "
R"-> 'C:\Users\ek\AppData\Local\Temp\test_renamekkbznwjp\parent\renamed\myname'"
"\nThis resembles other Windows errors, but only occurs starting in Python 3.12."
),
raises=PermissionError,
)
@with_rw_directory
def test_rename(self, rwdir):
parent = git.Repo.init(osp.join(rwdir, "parent"))
Expand All @@ -970,6 +958,12 @@ def test_rename(self, rwdir):
assert sm.rename(sm_name) is sm and sm.name == sm_name
assert not sm.repo.is_dirty(index=True, working_tree=False, untracked_files=False)

# This is needed to work around a PermissionError on Windows, resembling others,
# except new in Python 3.12. (*Maybe* this could be due to changes in CPython's
# garbage collector detailed in https://github.com/python/cpython/issues/97922.)
if os.name == "nt" and sys.version_info >= (3, 12):
gc.collect()

new_path = "renamed/myname"
assert sm.move(new_path).name == new_path

Expand Down
Loading