clean code

etcd3/stateful/lock.py

@@ -19,7 +19,6 @@ class EtcdLockAcquireTimeout(Exception):
     pass
 
 
-# TODO: [critical] thread safety
 class Lock(object):  # TODO: maybe we could improve the performance by reduce some HTTP requests
     """
     Locking recipe for etcd, inspired by the kazoo recipe for zookeeper
@@ -188,7 +187,7 @@ def acquire(self, block=True, lock_ttl=None, timeout=None, delete_key=True):
             if not locker.lease:
                 if not delete_key:
                     raise EtcdLockError("lock-key %s already exist but with no lease attached")
-                log.debug("delete key that has no expiration")
+                log.debug("delete lock key that has no expiration")
                 self.client.delete_range(locker.key)
             elif locker.value == self.uuid:
                 log.debug("we already have the lock")
@@ -206,13 +205,13 @@ def acquire(self, block=True, lock_ttl=None, timeout=None, delete_key=True):
             elif block:
                 event = self.wait(locker=locker, timeout=timeout)
                 if not event:
-                    log.debug("wait timeout")
+                    log.debug("lock acquire wait timeout")
                     raise EtcdLockAcquireTimeout
             else:
                 self.is_taken = True
                 return
         # locker key not found
-        log.debug("writing key to %s", self.lock_key)
+        log.debug("writing lock key to %s", self.lock_key)
         if self.lease and self.lease.keeping:  # clean old lease that may exist
             self.lease.revoke()
             self.__holders_lease = None

tests/test_lock_apis.py

@@ -33,7 +33,6 @@ def clear():
 
 
 @pytest.mark.timeout(60)
-@pytest.mark.skipif(NO_ETCD_SERVICE, reason="no etcd service available")
 def test_lock_flow(client):
     clear()
     holds = {}

tests/test_lock_util.py

@@ -30,7 +30,7 @@ def clear():
     etcdctl('del', '--from-key', '')
 
 
-@pytest.mark.skipif(NO_ETCD_SERVICE, reason="no etcd service available")
+@pytest.mark.timeout(60)
 def test_lock(client):
     clear()
     holds = {}
@@ -89,7 +89,7 @@ def hold(lock, name, ctx):
     assert l2.holders() == 0
 
 
-@pytest.mark.skipif(NO_ETCD_SERVICE, reason="no etcd service available")
+@pytest.mark.timeout(60)
 def test_reentrant_lock_host(client):
     clear()
     holds = {}
@@ -149,7 +149,6 @@ def hold(lock, name, ctx):
 
 
 @pytest.mark.timeout(60)
-@pytest.mark.skipif(NO_ETCD_SERVICE, reason="no etcd service available")
 def test_reentrant_lock(client):
     clear()
     holds = {}