Commit0eb38bc

committed

Fix test_blocking_lock_file for cygwin

This permits the longer delay in test_blocking_lock_file--which wasalready allowed for native Windows--on Cygwin, where it is alsoneeded. That lets the xfail mark for Cygwin be removed.This also updates the comments to avoid implying that the need forthe delay is AppVeyor-specific (it seems needed on CI and locally).

1 parent9c7ff1e commit0eb38bcCopy full SHA for 0eb38bc

File tree

1 file changed

-9

lines changed

test
- test_util.py

1 file changed

-9

lines changed

`‎test/test_util.py`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`fromunittestimportmock,skipIf`
`13`	`13`	`fromdatetimeimportdatetime`
`14`	`14`
`15`		`-importpytest`
`16`	`15`	`importddt`
`17`	`16`
`18`	`17`	`fromgit.cmdimportdashify`
`@@ -156,11 +155,6 @@ def test_lock_file(self):`
`156`	`155`	`lock_file._obtain_lock_or_raise()`
`157`	`156`	`lock_file._release_lock()`
`158`	`157`
`159`		`-@pytest.mark.xfail(`
`160`		`-sys.platform=="cygwin",`
`161`		`-reason="Cygwin fails here for some reason, always",`
`162`		`-raises=AssertionError,`
`163`		`- )`
`164`	`158`	`deftest_blocking_lock_file(self):`
`165`	`159`	`my_file=tempfile.mktemp()`
`166`	`160`	`lock_file=BlockingLockFile(my_file)`
`@@ -173,9 +167,8 @@ def test_blocking_lock_file(self):`
`173`	`167`	`self.assertRaises(IOError,wait_lock._obtain_lock)`
`174`	`168`	`elapsed=time.time()-start`
`175`	`169`	`extra_time=0.02`
`176`		`-ifis_win:`
`177`		`-# for Appveyor`
`178`		`-extra_time*=6# NOTE: Indeterministic failures here...`
	`170`	`+ifis_winorsys.platform=="cygwin":`
	`171`	`+extra_time*=6# NOTE: Indeterministic failures without this...`
`179`	`172`	`self.assertLess(elapsed,wait_time+extra_time)`
`180`	`173`
`181`	`174`	`deftest_user_id(self):`

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!

Commit0eb38bc

File tree

1 file changed

1 file changed

`‎test/test_util.py`

0 commit comments