Rev 5400: One-liner to fix the failing TestSSHConnections.test_bzr_connect_to_bzr_ssh in file:///home/vila/src/bzr/626876-bzr-connect-to-bzr-ssh/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/626876-bzr-connect-to-bzr-ssh/

------------------------------------------------------------
revno: 5400
revision-id: v.ladeuil+lp at free.fr-20100831141226-1vwk0zw410ti6dkn
parent: pqm at pqm.ubuntu.com-20100831101633-ta0o6c60gy2pc0as
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 626876-bzr-connect-to-bzr-ssh
timestamp: Tue 2010-08-31 16:12:26 +0200
message:
  One-liner to fix the failing TestSSHConnections.test_bzr_connect_to_bzr_ssh
-------------- next part --------------
=== modified file 'bzrlib/tests/stub_sftp.py'
--- a/bzrlib/tests/stub_sftp.py	2010-07-01 15:14:35 +0000
+++ b/bzrlib/tests/stub_sftp.py	2010-08-31 14:12:26 +0000
@@ -359,7 +359,7 @@
         # the test may need to be fixed instead, but it's late and the test is
         # horrible as mentioned in its comments :) -- vila 20100623
         import time
-        time.sleep(0.2)
+        time.sleep(0.5)
 
     def wrap_for_latency(self):
         tcs = self.server.test_case_server

=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py	2010-08-30 21:27:50 +0000
+++ b/bzrlib/tests/test_transport.py	2010-08-31 14:12:26 +0000
@@ -900,8 +900,6 @@
 
         bzr+ssh:// should cause bzr to run a remote bzr smart server over SSH.
         """
-        raise tests.TestSkipped('this test was recently broken,'
-                                ' see bug #626876')
         # This test actually causes a bzr instance to be invoked, which is very
         # expensive: it should be the only such test in the test suite.
         # A reasonable evolution for this would be to simply check inside