-def testOwner(user, owner, machine):
- if owner in (None, machine.owner):
- return None
- value = getafsgroups.checkLockerOwner(user.username, owner, verbose=True)
+def testOwner(user, owner, machine=None):
+ if owner == user or machine is not None and owner == machine.owner:
+ return owner
+ if owner is None:
+ raise InvalidInput('owner', owner, "Owner must be specified")
+ value = getafsgroups.checkLockerOwner(user, owner, verbose=True)