Rev 5219: (andrew) Add more logging to stub_sftp.SocketListener to help in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5219 [merge]
revision-id: pqm at pqm.ubuntu.com-20100510144914-yu9cxq3ihu2xwm4z
parent: pqm at pqm.ubuntu.com-20100507115028-tuuxmnormm8oetw6
parent: andrew.bennetts at canonical.com-20100510121235-4v1yj2hip4fp39gr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-05-10 15:49:14 +0100
message:
  (andrew) Add more logging to stub_sftp.SocketListener to help
  	diagnose intermittent test failures.
modified:
  bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
=== modified file 'bzrlib/tests/stub_sftp.py'
--- a/bzrlib/tests/stub_sftp.py	2010-03-11 04:33:41 +0000
+++ b/bzrlib/tests/stub_sftp.py	2010-05-10 12:12:35 +0000
@@ -283,15 +283,19 @@
         self._socket.close()
 
     def run(self):
+        trace.mutter('SocketListener %r has started', self)
         while True:
             readable, writable_unused, exception_unused = \
                 select.select([self._socket], [], [], 0.1)
             if self._stop_event.isSet():
+                trace.mutter('SocketListener %r has stopped', self)
                 return
             if len(readable) == 0:
                 continue
             try:
                 s, addr_unused = self._socket.accept()
+                trace.mutter('SocketListener %r has accepted connection %r',
+                    self, s)
                 # because the loopback socket is inline, and transports are
                 # never explicitly closed, best to launch a new thread.
                 threading.Thread(target=self._callback, args=(s,)).start()