tests: Fix dbusmock template when adding > 1 reader

This commit is contained in:
Bastien Nocera
2020-01-23 19:00:08 +01:00
parent 205dedae4f
commit b9d23ddb87

View File

@ -71,9 +71,6 @@ VALID_ENROLL_STATUS = [
'enroll-unknown-error' 'enroll-unknown-error'
] ]
# Ever incrementing device ID
last_id = 0
def load(mock, parameters): def load(mock, parameters):
fprintd = mockobject.objects[MAIN_OBJ] fprintd = mockobject.objects[MAIN_OBJ]
mock.last_device_id = 0 mock.last_device_id = 0
@ -116,7 +113,7 @@ def AddDevice(self, device_name, num_enroll_stages, scan_type):
name='org.freedesktop.DBus.Error.InvalidArgs') name='org.freedesktop.DBus.Error.InvalidArgs')
self.last_device_id += 1 self.last_device_id += 1
path = '/net/reactivated/Fprint/Device/%d' % last_id path = '/net/reactivated/Fprint/Device/%d' % self.last_device_id
device_properties = { device_properties = {
'name': dbus.String(device_name, variant_level=1), 'name': dbus.String(device_name, variant_level=1),
'num-enroll-stages': dbus.UInt32(num_enroll_stages, variant_level=1), 'num-enroll-stages': dbus.UInt32(num_enroll_stages, variant_level=1),