depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Allow multiple mock devices per driver

Browse source 
Instead of only loading `DRIVER/device`, now we also load all files
matching device-*[!~] in the DRIVER folder..
This commit is contained in:
Matthew Mirvish 2021-06-21 15:26:59 -04:00 committed by Benjamin Berg
parent 8be666bb05
commit 0697191387
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/umockdev-test.py
View file

@ -3,6 +3,7 @@
import sys import sys
import os import os
import os.path import os.path
import glob
import shutil import shutil
import tempfile import tempfile
import subprocess import subprocess
@ -30,7 +31,6 @@ ddir = sys.argv[1]
tmpdir = tempfile.mkdtemp(prefix='libfprint-umockdev-test-') tmpdir = tempfile.mkdtemp(prefix='libfprint-umockdev-test-')
assert os.path.isdir(ddir) assert os.path.isdir(ddir)
assert os.path.isfile(os.path.join(ddir, "device"))
def cmp_pngs(png_a, png_b): def cmp_pngs(png_a, png_b):
print("Comparing PNGs %s and %s" % (png_a, png_b)) print("Comparing PNGs %s and %s" % (png_a, png_b))
@ -59,14 +59,17 @@ def get_umockdev_runner(ioctl_basename):
ioctl = os.path.join(ddir, "{}.ioctl".format(ioctl_basename)) ioctl = os.path.join(ddir, "{}.ioctl".format(ioctl_basename))
pcap = os.path.join(ddir, "{}.pcapng".format(ioctl_basename)) pcap = os.path.join(ddir, "{}.pcapng".format(ioctl_basename))
device = os.path.join(ddir, "device") devices = glob.glob(os.path.join(ddir, "device")) + glob.glob(os.path.join(ddir, "device-*[!~]"))
device_args = []
if os.path.exists(pcap): for device in devices:
p = open(device).readline().strip() p = open(device).readline().strip()
assert p.startswith('P: ') assert p.startswith('P: ')
device_args.extend(("-d", device))
if os.path.exists(pcap):
syspath = '/sys' + p[3:] syspath = '/sys' + p[3:]
umockdev = ['umockdev-run', '-d', device, umockdev = ['umockdev-run', *device_args,
'-p', "%s=%s" % (syspath, pcap), '-p', "%s=%s" % (syspath, pcap),
'--'] '--']
@ -79,7 +82,7 @@ def get_umockdev_runner(ioctl_basename):
assert dev.startswith('@DEV ') assert dev.startswith('@DEV ')
dev = dev[5:] dev = dev[5:]
umockdev = ['umockdev-run', '-d', device, umockdev = ['umockdev-run', *device_args,
'-i', "%s=%s" % (dev, ioctl), '-i', "%s=%s" % (dev, ioctl),
'--'] '--']
wrapper = os.getenv('LIBFPRINT_TEST_WRAPPER') wrapper = os.getenv('LIBFPRINT_TEST_WRAPPER')