[lock] interoperate with go client

Author: pmazzini

kazoo/recipe/lock.py

@@ -80,7 +80,7 @@ class Lock(object):
 
     # Node names which exclude this contender when present at a lower
     # sequence number. Involved in read/write locks.
-    _EXCLUDE_NAMES = ["__lock__"]
+    _EXCLUDE_NAMES = ["__lock__", "-lock-"]
 
     def __init__(self, client, path, identifier=None):
         """Create a Kazoo lock.
@@ -289,7 +289,7 @@ def _get_sorted_children(self):
         # (eg. in case of a lease), just sort them last ('~' sorts after all
         # ASCII digits).
         def _seq(c):
-            for name in ["__lock__", "__rlock__"]:
+            for name in ["__lock__", "-lock-", "__rlock__"]:
                 idx = c.find(name)
                 if idx != -1:
                     return c[idx + len(name):]
@@ -392,7 +392,7 @@ class WriteLock(Lock):
 
     """
     _NODE_NAME = "__lock__"
-    _EXCLUDE_NAMES = ["__lock__", "__rlock__"]
+    _EXCLUDE_NAMES = ["__lock__", "-lock-", "__rlock__"]
 
 
 class ReadLock(Lock):
@@ -421,7 +421,7 @@ class ReadLock(Lock):
 
     """
     _NODE_NAME = "__rlock__"
-    _EXCLUDE_NAMES = ["__lock__"]
+    _EXCLUDE_NAMES = ["__lock__", "-lock-"]
 
 
 class Semaphore(object):

kazoo/tests/test_lock.py

@@ -1,12 +1,15 @@
 import collections
+import mock
 import threading
+import unittest
 import uuid
 
 import pytest
 
 from kazoo.exceptions import CancelledError
 from kazoo.exceptions import LockTimeout
 from kazoo.exceptions import NoNodeError
+from kazoo.recipe.lock import Lock
 from kazoo.testing import KazooTestCase
 from kazoo.tests import util as test_util
 
@@ -716,3 +719,16 @@ def _thread(sem, event, timeout):
             # Cleanup
             t.join()
             client2.stop()
+
+
+class TestSequence(unittest.TestCase):
+
+    def test_get_sorted_children(self):
+        goLock = "_c_8eb60557ba51e0da67eefc47467d3f34-lock-0000000031"
+        pyLock = "514e5a831836450cb1a56c741e990fd8__lock__0000000032"
+        children = [goLock, pyLock]
+        client = mock.MagicMock()
+        client.get_children.return_value = children
+        lock = Lock(client, "test")
+        sorted_children = lock._get_sorted_children()
+        assert sorted_children[0] == goLock