[Checkins] SVN: zc.zk/trunk/src/zc/zk/ Fixed: register_server broke when registering at /

[Jim Fulton]

Log message for revision 123662:
  Fixed: register_server broke when registering at /
  

Changed:
  U   zc.zk/trunk/src/zc/zk/__init__.py
  U   zc.zk/trunk/src/zc/zk/tests.py

-=-
Modified: zc.zk/trunk/src/zc/zk/__init__.py
===================================================================
--- zc.zk/trunk/src/zc/zk/__init__.py	2011-12-10 16:41:45 UTC (rev 123661)
+++ zc.zk/trunk/src/zc/zk/__init__.py	2011-12-10 16:41:48 UTC (rev 123662)
@@ -178,7 +178,9 @@
             addr = '%s:%s' % addr
         path = self.resolve(path)
         zc.zk.event.notify(RegisteringServer(addr, path, kw))
-        self.create(path + '/' + addr, encode(kw), acl, zookeeper.EPHEMERAL)
+        if path != '/':
+            path += '/'
+        self.create(path + addr, encode(kw), acl, zookeeper.EPHEMERAL)
 
     test_sleep = 0
     def _async(self, completion, meth, *args):

Modified: zc.zk/trunk/src/zc/zk/tests.py
===================================================================
--- zc.zk/trunk/src/zc/zk/tests.py	2011-12-10 16:41:45 UTC (rev 123661)
+++ zc.zk/trunk/src/zc/zk/tests.py	2011-12-10 16:41:48 UTC (rev 123662)
@@ -1024,6 +1024,18 @@
 
     """
 
+def register_server_at_root():
+    """
+    >>> zk = zc.zk.ZooKeeper('zookeeper.example.com:2181')
+    >>> zk.register_server('/', 'a:b')
+    >>> zk.print_tree() # doctest: +ELLIPSIS
+    /a:b
+      pid = 2318
+    /fooservice
+    ...
+    >>> zk.close()
+    """
+
 event = threading.Event()
 def check_async(show=True, expected_status=0):
     event.clear()