Commit 5944d09

committed

Mark test_conditional_includes_from_git_dir xfail on Windows

As noted, the second of the config._included_paths() assertions fails, which is in the "Ensure that config is included if path is matching git_dir" sub-case. It is returning 0 on Windows. THe GitConfigParser._has_includes function returns the expression: self._merge_includes and len(self._included_paths()) Since _merge_includes is a bool, it appears the first branch of the "and" is True, but then _included_paths returns an empty list.

1 parent a078d01 commit 5944d09Copy full SHA for 5944d09

File tree

1 file changed

-8

lines changed

test
- test_config.py

1 file changed

-8

lines changed

`‎test/test_config.py‎`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,15 @@`
`6`	`6`	`import glob`
`7`	`7`	`import io`
`8`	`8`	`import os`
	`9`	`+import os.path as osp`
`9`	`10`	`from unittest import mock`
`10`	`11`
	`12`	`+import pytest`
	`13`	`+`
`11`	`14`	`from git import GitConfigParser`
`12`	`15`	`from git.config import _OMD, cp`
`13`		`-from test.lib import (`
`14`		`- TestCase,`
`15`		`- fixture_path,`
`16`		`- SkipTest,`
`17`		`-)`
`18`		`-from test.lib import with_rw_directory`
`19`		`-`
`20`		`-import os.path as osp`
`21`	`16`	`from git.util import rmfile`
	`17`	`+from test.lib import SkipTest, TestCase, fixture_path, with_rw_directory`
`22`	`18`
`23`	`19`
`24`	`20`	`_tc_lock_fpaths = osp.join(osp.dirname(__file__), "fixtures/*.lock")`
`@@ -239,6 +235,11 @@ def check_test_value(cr, value):`
`239`	`235`	`with GitConfigParser(fpa, read_only=True) as cr:`
`240`	`236`	`check_test_value(cr, tv)`
`241`	`237`
	`238`	`+ @pytest.mark.xfail(`
	`239`	`+ os.name == "nt",`
	`240`	`+ reason='Second config._has_includes() assertion fails (for "config is included if path is matching git_dir")',`
	`241`	`+ raises=AssertionError,`
	`242`	`+ )`
`242`	`243`	`@with_rw_directory`
`243`	`244`	`def test_conditional_includes_from_git_dir(self, rw_dir):`
`244`	`245`	`# Initiate repository path.`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5944d09

File tree

1 file changed

1 file changed

`‎test/test_config.py‎`

0 commit comments