cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

device: Return 'enroll-failed' on cancelled enrollment

Browse Source 
We were returning an 'enroll-unknown-error' while we actually know what
happened, so better to return a soft operation failure.
This commit is contained in:
Marco Trevisan (Treviño)
2020-02-10 17:22:50 +01:00
committed by Bastien Nocera
parent c12778ec5b
commit b312a5e540
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device.c
View File

@ -381,6 +381,8 @@ enroll_result_to_name (gboolean completed, gboolean enrolled, GError *error)
return "enroll-disconnected"; return "enroll-disconnected";
else if (g_error_matches (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_DATA_FULL)) else if (g_error_matches (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_DATA_FULL))
return "enroll-data-full"; return "enroll-data-full";
else if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return "enroll-failed";
return "enroll-unknown-error"; return "enroll-unknown-error";
} }

7
tests/fprintd.py
View File

@ -521,6 +521,13 @@ class FPrintdVirtualDeviceTest(FPrintdTest):
self.device.Release() self.device.Release()
def test_enroll_stop_cancels(self):
self.device.Claim('(s)', 'testuser')
self.device.EnrollStart('(s)', 'left-index-finger')
self.device.EnrollStop()
self.wait_for_result(expected='enroll-failed')
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) == 2 and sys.argv[1] == "list-tests": if len(sys.argv) == 2 and sys.argv[1] == "list-tests":
for machine, human in list_tests(): for machine, human in list_tests():