Rev 6176: Instrument a bunch of stuff, trying to get it to cleanly fail. in http://bazaar.launchpad.net/~jameinel/bzr/2.5-hanging-tests

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.5-hanging-tests

------------------------------------------------------------
revno: 6176
revision-id: john at arbash-meinel.com-20110929150907-oe2x2fkfb4lx1dpv
parent: pqm at pqm.ubuntu.com-20110928153255-zb9flucmyyducc0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-hanging-tests
timestamp: Thu 2011-09-29 17:09:07 +0200
message:
  Instrument a bunch of stuff, trying to get it to cleanly fail.
-------------- next part --------------
=== modified file 'bzr'
--- a/bzr	2011-09-13 12:29:22 +0000
+++ b/bzr	2011-09-29 15:09:07 +0000
@@ -126,7 +126,7 @@
 bzrlib.breakin.hook_debugger_to_signal()
 
 import bzrlib.decorators
-if ('--lsprof' in sys.argv
+if True or ('--lsprof' in sys.argv
     or '--lsprof-file' in sys.argv
     or '--profile' in sys.argv
     or '--lsprof-timed' in sys.argv):

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2011-09-18 14:57:54 +0000
+++ b/bzrlib/remote.py	2011-09-29 15:09:07 +0000
@@ -2096,7 +2096,8 @@
             try:
                 response = client.call_with_body_stream(
                     (verb, path, '') + lock_args, byte_stream)
-            except errors.UnknownSmartMethod:
+            except errors.UnknownSmartMethod, e:
+                import pdb; pdb.set_trace()
                 medium._remember_remote_is_before(required_version)
             else:
                 found_verb = True

=== modified file 'bzrlib/smart/medium.py'
--- a/bzrlib/smart/medium.py	2011-09-26 07:56:05 +0000
+++ b/bzrlib/smart/medium.py	2011-09-29 15:09:07 +0000
@@ -297,7 +297,8 @@
         readable handle before timeout_seconds.
         :return: None
         """
-        t_end = self._timer() + timeout_seconds
+        t_start = self._timer()
+        t_end = t_start + timeout_seconds
         poll_timeout = min(timeout_seconds, self._client_poll_timeout)
         rs = xs = None
         while not rs and not xs and self._timer() < t_end:
@@ -318,6 +319,7 @@
                 raise
         if rs or xs:
             return
+        trace.mutter('Waited %.3fs for client.' % (self._timer() - t_start,))
         raise errors.ConnectionTimeout('disconnecting client after %.1f seconds'
                                        % (timeout_seconds,))
 

=== modified file 'bzrlib/smart/message.py'
--- a/bzrlib/smart/message.py	2011-03-02 20:16:03 +0000
+++ b/bzrlib/smart/message.py	2011-09-29 15:09:07 +0000
@@ -302,6 +302,7 @@
         if 'hpss' in debug.debug_flags:
             mutter('   result:   %r', self.args)
         if self.status == 'E':
+            import pdb; pdb.set_trace()
             self._wait_for_response_end()
             _raise_smart_server_error(self.args)
         return tuple(self.args)

=== modified file 'bzrlib/tests/per_interrepository/test_fetch.py'
--- a/bzrlib/tests/per_interrepository/test_fetch.py	2011-05-08 13:07:11 +0000
+++ b/bzrlib/tests/per_interrepository/test_fetch.py	2011-09-29 15:09:07 +0000
@@ -180,6 +180,7 @@
         self.setup_smart_server_with_call_log()
         self.disable_verb('Repository.insert_stream_1.19')
         self.test_fetch_parent_inventories_at_stacking_boundary()
+        print self.get_log()
 
     def test_fetch_parent_inventories_at_stacking_boundary(self):
         """Fetch to a stacked branch copies inventories for parents of