Rev 2566: fix up doctest example for token being returned from wait_lock in http://sourcefrog.net/bzr/dlock

[Martin Pool]

At http://sourcefrog.net/bzr/dlock

------------------------------------------------------------
revno: 2566
revision-id: mbp at sourcefrog.net-20070628075302-mfmh7npjdyjb22mc
parent: mbp at sourcefrog.net-20070628074325-fewhyi24ittr3kyz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Thu 2007-06-28 17:53:02 +1000
message:
  fix up doctest example for token being returned from wait_lock
modified:
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py	2007-06-28 07:43:25 +0000
+++ b/bzrlib/lockdir.py	2007-06-28 07:53:02 +0000
@@ -88,7 +88,7 @@
 >>> t = MemoryTransport()
 >>> l = LockDir(t, 'sample-lock')
 >>> l.create()
->>> l.wait_lock()
+>>> token = l.wait_lock()
 >>> # do something here
 >>> l.unlock()
 

=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py	2007-06-28 06:06:30 +0000
+++ b/bzrlib/tests/test_lockdir.py	2007-06-28 07:53:02 +0000
@@ -648,3 +648,15 @@
         e = self.assertRaises(errors.LockError, ld2.attempt_lock)
         self.assertContainsRe(str(e),
                 "rename succeeded, but lock is still held by someone else")
+
+    def test_failed_lock_leaves_no_trash(self):
+        # if we fail to acquire the lock, we don't leave pending directories
+        # behind
+        ld1 = self.get_lock()
+        ld2 = self.get_lock()
+        # should be nothing before we start
+            bzrlib.smart.server.SmartTCPServer: bzrlib.smart.server.SmartTCPServer.hooks,
+        t = self.get_transport().clone('lockdir')
+        self.assertEquals([], t.listdir())
+        
+