qa: fix attributeTracker

neo/lib/locking.py

@@ -26,7 +26,7 @@ from Queue import Empty
 
 class LockUser(object):
 
-    def __init__(self, message, level=0):
+    def __init__(self, message=None, level=0):
         t = threading.currentThread()
         ident = getattr(t, 'node_name', t.name)
         # This class is instantiated from a place desiring to known what
@@ -42,9 +42,10 @@ class LockUser(object):
         # current Neo directory structure.
         path = os.path.join('...', *path.split(os.path.sep)[-3:])
         self.time = time()
-        self.ident = "%s@%r %s:%s %s" % (
-            ident, self.time, path, line_number, line)
-        self.note(message)
+        if message is not None:
+            self.ident = "%s@%r %s:%s %s" % (
+                ident, self.time, path, line_number, line)
+            self.note(message)
         self.ident = ident
 
     def __eq__(self, other):

neo/lib/node.py

@@ -118,8 +118,8 @@ class Node(object):
             if connection.isServer():
                 self.setIdentified()
         else:
-            assert force is not None, \
-                attributeTracker.whoSet(self, '_connection')
+            assert force is not None, (conn,
+                attributeTracker.whoSet(self, '_connection'))
             # The test on peer_id is there to protect against buggy nodes.
             # XXX: handler comparison does not cover all cases: there may
             # be a pending handler change, which won't be detected, or a future