Skip to content

Fix Zapper-driven EDID cycling test case #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 20, 2023
Merged

Fix Zapper-driven EDID cycling test case #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72213b3
Fix: EDID cycling is asserting resolution with the wrong data
p-gentili Jul 3, 2023
a1c1bfd
Change: unplug and plug back the HDMI
p-gentili Jul 4, 2023
ba1dc69
flake8
p-gentili Jul 4, 2023
db82a18
Change: r-string literal, and some adjustment
p-gentili Jul 7, 2023
7dda208
Change: match-dedicated function with doctests
p-gentili Jul 7, 2023
25ef3e6
Change: smarter delay between iterations
p-gentili Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 107 additions & 8 deletions providers/base/bin/edid_cycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,115 @@
import sys
import time

from monitor_hotplug import check_connected

from checkbox_support.scripts.zapper_proxy import ( # noqa: E402
zapper_run)

PATTERN = r"^HDMI-1.*\n.*^\s+(\d+x\d+).*\*"


def _match(output):
"""
Match the given randr output with a pattern to grab
the current resolution on HDMI-1.

Both gnome-randr and xrandr highlight the currently
selected resolution for each monitor with a `*`.

xrandr
>>> _match("Screen 0: minimum 320 x 200, current 1920 x 1080,"
... " maximum 16384 x 16384i\\n"
... "DPI-1 connected primary 1920x1080+0+0 (normal left inverted"
... " 1920x1080 60.00*+ 59.97 59.96 59.93 40.00\\n"
... "HDMI-1 connected primary 1920x1080+0+0 (normal left inverted"
... " right x axis y axis) 309mm x 174mm\\n"
... " 1920x1080 60.00+ 59.97 59.96 59.93 40.00\\n"
... " 1680x1050 59.95 59.88\\n"
... " 1600x1024 60.17*\\n")
'1600x1024'

xrandr, no output on HDMI-1
>>> _match("Screen 0: minimum 320 x 200, current 1920 x 1080,"
... " maximum 16384 x 16384i\\n"
... "DPI-1 connected primary 1920x1080+0+0 (normal left inverted"
... " 1920x1080 60.00*+ 59.97 59.96 59.93 40.00\\n"
... "HDMI-1 connected primary 1920x1080+0+0 (normal left inverted"
... " right x axis y axis) 309mm x 174mm\\n"
... " 1920x1080 60.00+ 59.97 59.96 59.93 40.00\\n"
... " 1680x1050 59.95 59.88\\n")

xrandr, no HDMI-1 available
>>> _match("Screen 0: minimum 320 x 200, current 1920 x 1080,"
... " maximum 16384 x 16384i\\n"
... "DPI-1 connected primary 1920x1080+0+0 (normal left inverted"
... " 1920x1080 60.00*+ 59.97 59.96 59.93 40.00\\n")

gnome-randr
>>> _match("supports-mirroring: true\\n"
... "layout-mode: physical\\n"
... "supports-changing-layout-mode: false\\n"
... "global-scale-required: false\\n"
... "legacy-ui-scaling-factor: 1\\n"
... 'renderer: "native"\\n\\n'
... "logical monitor 0:\\n"
... "x: 0, y: 0, scale: 1, rotation: normal, primary: yes\\n"
... "associated physical monitors:\\n"
... " HDMI-1 DEL DELL U2722DE 4M9KFH3\\n\\n"
... "HDMI-1 DEL DELL U2722DE 4M9KFH3\\n"
... " 2560x1440@59.951 2560x1440 59.95+"
... "[x1.00+, x2.00, x3.00]\\n"
... " 2048x1080@23.997 2048x1080 24.00*"
... "[x1.00+, x2.00]\\n")
'2048x1080'
"""
match = re.search(PATTERN, output, re.MULTILINE | re.DOTALL)
if match:
return match.group(1)
return None


def check_resolution():
output = subprocess.check_output('xdpyinfo')
for line in output.decode(sys.stdout.encoding).splitlines():
if 'dimensions' in line:
match = re.search(r'(\d+)x(\d+)\ pixels', line)
if match and len(match.groups()) == 2:
return '{}x{}'.format(*match.groups())
"""
Check output resolution on HDMI using randr.
"""
if os.getenv('XDG_SESSION_TYPE') == 'wayland':
cmd = "gnome-randr"
else:
cmd = "xrandr"

randr_output = subprocess.check_output(
[cmd],
universal_newlines=True, encoding="utf-8")

return _match(randr_output)


def _wait_edid_change(expected):
"""
Wait until `expected` connection state is reached.
Times out after 5 seconds.
"""
iteration = 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one cool pythonic way of doing similar thing is:

for iteration in enumerate(5):
    if check_connected("HDMI-1") == expected:
        break
else:
    raise TimeoutError

But the one here is perfectly fine

max_iter = 5
while check_connected("HDMI-1") != expected and iteration < max_iter:
time.sleep(1)
iteration += 1

if iteration == max_iter:
raise TimeoutError


def change_edid(host, edid_file):
"""Clear EDID and then 'plug' back a new monitor."""
zapper_run(host, "change_edid", None)
_wait_edid_change(False)

with open(edid_file, 'rb') as f:
zapper_run(host, "change_edid", f.read())

_wait_edid_change(True)


def main():
if len(sys.argv) != 2:
Expand All @@ -40,15 +132,22 @@ def main():
print('changing EDID to {}'.format(res))
edid_file = os.path.expandvars(os.path.join(
'$PLAINBOX_PROVIDER_DATA', 'edids', '{}.edid'.format(res)))
change_edid(sys.argv[1], edid_file)
time.sleep(5)

try:
change_edid(sys.argv[1], edid_file)
except TimeoutError:
print("FAIL, timed out.")
failed = True
continue

print('checking resolution... ', end='')
actual_res = check_resolution()
if actual_res != res:
print('FAIL, got {} instead'.format(actual_res))
failed = True
else:
print('PASS')

return failed


Expand Down
8 changes: 4 additions & 4 deletions providers/base/bin/monitor_hotplug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
zapper_run)


def _check_connected(device):
def check_connected(device):
if os.getenv('XDG_SESSION_TYPE') == 'wayland':
xrandr_output = subprocess.check_output(
["gnome-randr", "query", device],
Expand Down Expand Up @@ -56,23 +56,23 @@ def main():

print("unplugging {}... ".format(args.peripheral), end="")
_change_fn[args.peripheral](args.host, "disconnected")
if _check_connected(device) is False:
if check_connected(device) is False:
print("PASS")
else:
failed = True
print("FAILED")

print("plugging {}... ".format(args.peripheral), end="")
_change_fn[args.peripheral](args.host, "connected")
if _check_connected(device) is True:
if check_connected(device) is True:
print("PASS")
else:
failed = True
print("FAILED")

print("unplugging {}... ".format(args.peripheral), end="")
_change_fn[args.peripheral](args.host, "disconnected")
if _check_connected(device) is False:
if check_connected(device) is False:
print("PASS")
else:
failed = True
Expand Down