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

tests/fprintd: Move permissions checks to a single function

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2020-12-17 01:00:54 +01:00
parent 76c6e9e030
commit 3fe268f6f2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/fprintd.py
View File

@ -297,6 +297,13 @@ class FPrintdTest(dbusmock.DBusTestCase):
return self.assertRaisesRegex(GLib.Error, return self.assertRaisesRegex(GLib.Error,
'.*net\.reactivated\.Fprint\.Error\.{}.*'.format(fprint_error)) '.*net\.reactivated\.Fprint\.Error\.{}.*'.format(fprint_error))
def skipTestIfCanWrite(self, path):
try:
os.open(os.path.join(path, "testfile"), os.O_CREAT | os.O_WRONLY)
self.skipTest('Permissions aren\'t respected (CI environment?)')
except PermissionError:
pass
@property @property
def finger_needed(self): def finger_needed(self):
return self.device.get_cached_property('finger-needed').unpack() return self.device.get_cached_property('finger-needed').unpack()
@ -1236,11 +1243,7 @@ class FPrintdVirtualDeviceClaimedTest(FPrintdVirtualDeviceBaseTest):
os.makedirs(self.state_dir, mode=0o500) os.makedirs(self.state_dir, mode=0o500)
self.addCleanup(os.chmod, self.state_dir, mode=0o700) self.addCleanup(os.chmod, self.state_dir, mode=0o700)
try: self.skipTestIfCanWrite(self.state_dir)
os.open(os.path.join(self.state_dir, "testfile"), os.O_CREAT | os.O_WRONLY)
self.skipTest('Permissions aren\'t respected (CI environment?)')
except PermissionError:
pass
self.enroll_image('whorl', expected_result='enroll-failed') self.enroll_image('whorl', expected_result='enroll-failed')
@ -1249,11 +1252,7 @@ class FPrintdVirtualDeviceClaimedTest(FPrintdVirtualDeviceBaseTest):
os.chmod(self.state_dir, mode=0o000) os.chmod(self.state_dir, mode=0o000)
self.addCleanup(os.chmod, self.state_dir, mode=0o700) self.addCleanup(os.chmod, self.state_dir, mode=0o700)
try: self.skipTestIfCanWrite(self.state_dir)
os.open(os.path.join(self.state_dir, "testfile"), os.O_CREAT | os.O_WRONLY)
self.skipTest('Permissions aren\'t respected (CI environment?)')
except PermissionError:
pass
with self.assertFprintError('NoEnrolledPrints'): with self.assertFprintError('NoEnrolledPrints'):
self.device.VerifyStart('(s)', 'any') self.device.VerifyStart('(s)', 'any')