Add the wait-on-locks option for acquiring lock

pytest_lab/locker.py

@@ -122,22 +122,31 @@ def __init__(self, config, backend, ttl=30):
         self._thread = None
         self._stop = threading.Event()
 
-    def aquire(self, key, user=None):
+    def aquire(self, key, wait_on_locks, user=None):
         record = self.backend.read(key)
 
-        if record and record.ttl:
-            logger.error('{} 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)
-                if not record:
-                    break
-                time.sleep(0.5)
-
-        if record:
-            raise ResourceLocked(
-                '{} is currently locked by {}'.format(key, record.value))
+        def check_record(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))
+                start = time.time()
+                while time.time() - start < record.ttl + 1:
+                    record = self.backend.read(key)
+                    if not record:
+                        return True
+                    time.sleep(0.5)
+            else:
+                return True
+
+        if not check_record(record):
+            if wait_on_locks:
+                while True:
+                    if check_record(record):
+                        break
+            else:
+                raise ResourceLocked(
+                    '{} is currently locked by {}'.format(key, record.value))
 
         # acquire
         lockid = get_lock_id(user)
@@ -173,7 +182,7 @@ def pytest_unconfigure(self, config):
 
     @pytest.hookimpl
     def pytest_lab_aquire_lock(self, config, identifier):
-        self.aquire(identifier)
+        self.aquire(identifier, config.getoption('--wait-on-locks'))
         return True
 
     @pytest.hookimpl