Commit487bc8a

committed

Start making TestCygpath xfail markings granular

This marks only the one really expected failure case inin test_cygpath_norm_ok as xfail, preventing the others fromgiving "XPASS" results each time the tests are run.

1 parent1dccb8e commit487bc8aCopy full SHA for 487bc8a

File tree

1 file changed

-5

lines changed

test
- test_util.py

1 file changed

-5

lines changed

`‎test/test_util.py`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,11 @@ def test_env_vars_for_windows_tests(self, name, env_var_value, expected_truth_va`
`211`	`211`	`assertactual_parsed_valueisexpected_truth_value`
`212`	`212`
`213`	`213`
	`214`	`+def_xfail_param(values,*xfail_kwargs):`
	`215`	`+"""Build a pytest.mark.parametrize parameter that carries an xfail mark."""`
	`216`	`+returnpytest.param(values,marks=pytest.mark.xfail(*xfail_kwargs))`
	`217`	`+`
	`218`	`+`
`214`	`219`	`@pytest.mark.skipif(sys.platform!="cygwin",reason="Paths specifically for Cygwin.")`
`215`	`220`	`classTestCygpath:`
`216`	`221`	"""Tests for :func:`git.util.cygpath` and :func:`git.util.decygpath`."""
`@@ -246,15 +251,11 @@ def test_cygpath_ok(self, wpath, cpath):`
`246`	`251`	`cwpath=cygpath(wpath)`
`247`	`252`	`assertcwpath==cpath,wpath`
`248`	`253`
`249`		`-@pytest.mark.xfail(`
`250`		`-reason=R'2nd example r".\bar" -> "bar" fails, returns "./bar"',`
`251`		`-raises=AssertionError,`
`252`		`- )`
`253`	`254`	`@pytest.mark.parametrize(`
`254`	`255`	`"wpath, cpath",`
`255`	`256`	`[`
`256`	`257`	`(R"./bar","bar"),`
`257`		`- (R".\bar","bar"),# FIXME: Mark only this one xfail (or fix it).`
	`258`	`+_xfail_param(R".\bar","bar",reason=R'Returns: "./bar"',raises=AssertionError),`
`258`	`259`	`(R"../bar","../bar"),`
`259`	`260`	`(R"..\bar","../bar"),`
`260`	`261`	`(R"../bar/.\foo/../chu","../bar/chu"),`

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!

Commit487bc8a

File tree

1 file changed

1 file changed

`‎test/test_util.py`

0 commit comments