Commit881456b

committed

Run test_commit_msg_hook_success on more systems

This changes a default Windows skip of test_commit_msg_hook_successto an xfail, and makes it more specific, expecting failure onlywhen either bash.exe is unavailable (definitely expected) or whenbash.exe is the WSL bash wrapper in System32, which fails for somereason even though it's not at all clear it ought to.This showcases the failures rather than skipping, and also lets thetest pass on Windows systems where bash.exe is something else,including the Git Bash bash.exe that native Windows CI would use.

1 parentd6a2d28 commit881456bCopy full SHA for 881456b

File tree

1 file changed

+22

-6

lines changed

test
- test_index.py

1 file changed

+22

-6

lines changed

`‎test/test_index.py`

Lines changed: 22 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,14 @@`
`7`	`7`
`8`	`8`	`fromioimportBytesIO`
`9`	`9`	`importos`
	`10`	`+importos.pathasosp`
	`11`	`+frompathlibimportPath`
`10`	`12`	`fromstatimportS_ISLNK,ST_MODE`
	`13`	`+importshutil`
`11`	`14`	`importtempfile`
`12`	`15`	`fromunittestimportskipIf`
`13`		`-importshutil`
	`16`	`+`
	`17`	`+importpytest`
`14`	`18`
`15`	`19`	`fromgitimport (`
`16`	`20`	`IndexFile,`
`@@ -23,6 +27,7 @@`
`23`	`27`	`GitCommandError,`
`24`	`28`	`CheckoutError,`
`25`	`29`	`)`
	`30`	`+fromgit.cmdimportGit`
`26`	`31`	`fromgit.compatimportis_win`
`27`	`32`	`fromgit.excimportHookExecutionError,InvalidGitRepositoryError`
`28`	`33`	`fromgit.index.funimporthook_path`
`@@ -34,15 +39,22 @@`
`34`	`39`	`fromgit.utilimportHIDE_WINDOWS_KNOWN_ERRORS,hex_to_bin`
`35`	`40`	`fromgitdb.baseimportIStream`
`36`	`41`
`37`		`-importos.pathasosp`
`38`		`-fromgit.cmdimportGit`
	`42`	`+HOOKS_SHEBANG="#!/usr/bin/env sh\n"`
`39`	`43`
`40`		`-frompathlibimportPath`
`41`	`44`
`42`		`-HOOKS_SHEBANG="#!/usr/bin/env sh\n"`
	`45`	`+def_found_in(cmd,directory):`
	`46`	`+"""Check if a command is resolved in a directory (without following symlinks)."""`
	`47`	`+path=shutil.which(cmd)`
	`48`	`+returnpathandPath(path).parent==Path(directory)`
	`49`	`+`
`43`	`50`
`44`	`51`	`is_win_without_bash=is_winandnotshutil.which("bash.exe")`
`45`	`52`
	`53`	`+is_win_with_wsl_bash=is_winand_found_in(`
	`54`	`+cmd="bash.exe",`
	`55`	`+directory=Path(os.getenv("WINDIR"))/"System32",`
	`56`	`+)`
	`57`	`+`
`46`	`58`
`47`	`59`	`def_make_hook(git_dir,name,content,make_exec=True):`
`48`	`60`	`"""A helper to create a hook"""`
`@@ -910,7 +922,11 @@ def test_pre_commit_hook_fail(self, rw_repo):`
`910`	`922`	`else:`
`911`	`923`	`raiseAssertionError("Should have caught a HookExecutionError")`
`912`	`924`
`913`		`-@skipIf(HIDE_WINDOWS_KNOWN_ERRORS,"TODO: fix hooks execution on Windows: #703")`
	`925`	`+@pytest.mark.xfail(`
	`926`	`+is_win_without_bashoris_win_with_wsl_bash,`
	`927`	`+reason="Specifically seems to fail on WSL bash (in spite of #1399)",`
	`928`	`+raises=AssertionError,`
	`929`	`+ )`
`914`	`930`	`@with_rw_repo("HEAD",bare=True)`
`915`	`931`	`deftest_commit_msg_hook_success(self,rw_repo):`
`916`	`932`	`commit_message="commit default head by Frèderic Çaufl€"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit881456b

File tree

1 file changed

1 file changed

`‎test/test_index.py`

0 commit comments