Rev 3739: Merge down-thread in file:///v/home/vila/src/bzr/experimental/bzr-py26-compat/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/bzr-py26-compat/

------------------------------------------------------------
revno: 3739
revision-id: v.ladeuil+lp at free.fr-20080926075800-b5nz0089gtfkxwiu
parent: v.ladeuil+lp at free.fr-20080926070950-ux9kpjwt403ctegs
parent: v.ladeuil+lp at free.fr-20080926075608-caw6xsw0rznnly7c
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecations
timestamp: Fri 2008-09-26 09:58:00 +0200
message:
  Merge down-thread
modified:
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
    ------------------------------------------------------------
    revno: 3737.1.1
    revision-id: v.ladeuil+lp at free.fr-20080926075608-caw6xsw0rznnly7c
    parent: v.ladeuil+lp at free.fr-20080925160322-omrugnbgkcwp9eo2
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: no-params-for-new-init
    timestamp: Fri 2008-09-26 09:56:08 +0200
    message:
      Fix SmartHTTPMedium refactoring related test.
      
      * bzrlib/tests/test_http.py:
      (SmartClientAgainstNotSmartServer.test_probe_smart_server): Fix
      lost in the noise in the previous commit.
    modified:
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2008-09-25 16:03:22 +0000
+++ b/bzrlib/tests/test_http.py	2008-09-26 07:56:08 +0000
@@ -1740,5 +1740,6 @@
         # No need to build a valid smart request here, the server will not even
         # try to interpret it.
         self.assertRaises(errors.SmartProtocolError,
-                          t.send_http_smart_request, 'whatever')
+                          t.get_smart_medium().send_http_smart_request,
+                          'whatever')