Add the function to check if there is an existing lock for the key

pytest_lab/locker.py

@@ -125,11 +125,11 @@ def __init__(self, config, backend, ttl=30):
     def aquire(self, key, wait_on_locks, user=None):
         record = self.backend.read(key)
 
-        def check_record(record):
+        def check_lock(record):
             if record and record.ttl:
                 logger.error(
-                    '{} is locked by {}, waiting {} seconds for re-checking '
-                    'lock to expire...'.format(key, record.value, record.ttl + 1))
+                    '{} is locked by {}, waiting {} seconds for lock '
+                    'to expire...'.format(key, record.value, record.ttl + 1))
                 start = time.time()
                 while time.time() - start < record.ttl + 1:
                     record = self.backend.read(key)
@@ -139,14 +139,14 @@ def check_record(record):
             else:
                 return True
 
-        if not check_record(record):
-            if wait_on_locks:
-                while True:
-                    if check_record(record):
-                        break
-            else:
+        # Check if the key is locked or not
+        if not check_lock(record):
+            if not wait_on_locks:
                 raise ResourceLocked(
                     '{} is currently locked by {}'.format(key, record.value))
+            while True:
+                if check_lock(record):
+                    break
 
         # acquire
         lockid = get_lock_id(user)