Commit19bad37

committed

feat: add XVFB_RESOLUTION

1 parentbaa79ae commit19bad37Copy full SHA for 19bad37

File tree

+32

-1

lines changed

+32

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`fromcontextlibimportsuppress`
`9`	`9`	`fromenumimportEnum,auto,unique`
`10`	`10`	`fromloggingimportgetLogger`
	`11`	`+fromosimportenviron`
`11`	`12`	`fromplatformimportsystem`
`12`	`13`	`fromtypesimportMappingProxyType`
`13`	`14`	`fromtypingimportTYPE_CHECKING`
`@@ -74,8 +75,18 @@ class XvfbDisplay(Display):`
`74`	`75`	`def__init__(self)->None:`
`75`	`76`	`super().__init__()`
`76`	`77`	`self.env=MappingProxyType({"MOZ_ENABLE_WAYLAND":"0"})`
	`78`	`+resolution=environ.get("XVFB_RESOLUTION")`
	`79`	`+width=1280`
	`80`	`+height=1024`
	`81`	`+ifresolutionisnotNone:`
	`82`	`+try:`
	`83`	`+w_str,h_str=resolution.lower().split("x")`
	`84`	`+width,height=int(w_str),int(h_str)`
	`85`	`+exceptValueError:`
	`86`	`+LOG.warning("Invalid XVFB_RESOLUTION '%s'",resolution)`
	`87`	`+LOG.debug("xvfb resolution: %dx%d",width,height)`
`77`	`88`	`try:`
`78`		`-self._xvfb:Xvfb\|None=Xvfb(width=1280,height=1024)`
	`89`	`+self._xvfb:Xvfb\|None=Xvfb(width=width,height=height)`
`79`	`90`	`exceptNameError:`
`80`	`91`	`LOG.error("Missing xvfbwrapper")`
`81`	`92`	`raise`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,3 +36,23 @@ def test_xvfb_missing_deps(mocker):`
`36`	`36`	`mocker.patch("ffpuppet.display.Xvfb",side_effect=NameError("test"))`
`37`	`37`	`withraises(NameError):`
`38`	`38`	`XvfbDisplay()`
	`39`	`+`
	`40`	`+`
	`41`	`+@mark.skipif(system()!="Linux",reason="Only supported on Linux")`
	`42`	`+@mark.parametrize(`
	`43`	`+"resolution, expected_width, expected_height",`
	`44`	`+ (`
	`45`	`+ (None,1280,1024),`
	`46`	`+ ("1920x1080",1920,1080),`
	`47`	`+ ("a",1280,1024),`
	`48`	`+ ),`
	`49`	`+)`
	`50`	`+deftest_xvfb_resolution(mocker,resolution,expected_width,expected_height):`
	`51`	`+"""test XvfbDisplay() XVFB_RESOLUTION"""`
	`52`	`+xvfb=mocker.patch("ffpuppet.display.Xvfb",autospec=True)`
	`53`	`+mocker.patch.dict(`
	`54`	`+"ffpuppet.display.environ",`
	`55`	`+ {}ifresolutionisNoneelse {"XVFB_RESOLUTION":resolution},`
	`56`	`+ )`
	`57`	`+XvfbDisplay()`
	`58`	`+xvfb.assert_called_with(width=expected_width,height=expected_height)`

Comments

(0)