Commitab182c2

committed

fix(display): ignore xvfb shutdown timeout errors

1 parent56d6cbf commitab182c2Copy full SHA for ab182c2

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`fromloggingimportgetLogger`
`10`	`10`	`fromosimportenviron`
`11`	`11`	`fromplatformimportsystem`
	`12`	`+fromsubprocessimportTimeoutExpired`
`12`	`13`	`fromtypesimportMappingProxyType`
`13`	`14`	`fromtypingimportTYPE_CHECKING`
`14`	`15`
`@@ -93,7 +94,11 @@ def __init__(self) -> None:`
`93`	`94`
`94`	`95`	`defclose(self)->None:`
`95`	`96`	`ifself._xvfbisnotNone:`
`96`		`-self._xvfb.stop()`
	`97`	`+try:`
	`98`	`+self._xvfb.stop()`
	`99`	`+exceptTimeoutExpired:`
	`100`	`+ifself._xvfb.procisnotNone:`
	`101`	`+self._xvfb.proc.kill()`
`97`	`102`	`self._xvfb=None`
`98`	`103`
`99`	`104`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"""display.py tests"""`
`5`	`5`
`6`	`6`	`fromplatformimportsystem`
	`7`	`+fromsubprocessimportTimeoutExpired`
`7`	`8`
`8`	`9`	`frompytestimportmark,raises`
`9`	`10`
`@@ -55,4 +56,15 @@ def test_xvfb_resolution(mocker, resolution, expected_width, expected_height):`
`55`	`56`	`{}ifresolutionisNoneelse {"XVFB_RESOLUTION":resolution},`
`56`	`57`	`)`
`57`	`58`	`XvfbDisplay()`
	`59`	`+assertxvfb.return_value.start.call_count==1`
`58`	`60`	`xvfb.assert_called_with(width=expected_width,height=expected_height,timeout=60)`
	`61`	`+`
	`62`	`+`
	`63`	`+@mark.skipif(system()!="Linux",reason="Only supported on Linux")`
	`64`	`+deftest_xvfb_stop_hang(mocker):`
	`65`	`+"""test XvfbDisplay.stop hang"""`
	`66`	`+xvfb=mocker.patch("ffpuppet.display.Xvfb")`
	`67`	`+xvfb.return_value.stop.side_effect=TimeoutExpired(["foo"],1)`
	`68`	`+display=XvfbDisplay()`
	`69`	`+display.close()`
	`70`	`+assertxvfb.return_value.proc.kill.call_count==1`

Comments

(0)