Rev 4384: (vila) Fix pycurl/python2.6 broken tests in more cases in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4384
revision-id: pqm at pqm.ubuntu.com-20090527193433-rw9zh1l73zjc9knb
parent: pqm at pqm.ubuntu.com-20090527143530-bj2950n49h52cyw3
parent: v.ladeuil+lp at free.fr-20090527141436-w51gugnqaewqxlgb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-05-27 20:34:33 +0100
message:
  (vila) Fix pycurl/python2.6 broken tests in more cases
modified:
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
    ------------------------------------------------------------
    revno: 4382.2.2
    revision-id: v.ladeuil+lp at free.fr-20090527141436-w51gugnqaewqxlgb
    parent: v.ladeuil+lp at free.fr-20090527133841-cam9bhs7ykpsfc10
    parent: v.ladeuil+lp at free.fr-20090527135947-wwclbmut68jkivml
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: trunk
    timestamp: Wed 2009-05-27 16:14:36 +0200
    message:
      Fix pycurl/python2.6 broken tests in more cases
    modified:
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
    ------------------------------------------------------------
    revno: 4382.1.3
    revision-id: v.ladeuil+lp at free.fr-20090527135947-wwclbmut68jkivml
    parent: v.ladeuil+lp at free.fr-20090527133141-re2v0y86fnx25r4k
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: pycurl-tests
    timestamp: Wed 2009-05-27 15:59:47 +0200
    message:
      Take more configurations into account.
      
      * bzrlib/tests/test_http.py:
      (load_tests): Use the right combination whatever feature is
      present (pyrculr OR python2.6 https support).
    modified:
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2009-05-27 13:31:41 +0000
+++ b/bzrlib/tests/test_http.py	2009-05-27 13:59:47 +0000
@@ -149,15 +149,18 @@
                 TestActivity,
                 )))
     activity_scenarios = [
-        ('http', dict(_activity_server=ActivityHTTPServer)),
-        ]
-    act_transport_scenarios = [
-        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,)),
+        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
+                             _transport=_urllib.HttpTransport_urllib,)),
         ]
     if tests.HTTPSServerFeature.available():
         activity_scenarios.append(
-            ('https', dict(_activity_server=ActivityHTTPSServer)))
-        if pycurl_present:
+            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
+                                  _transport=_urllib.HttpTransport_urllib,)),)
+    if pycurl_present:
+        activity_scenarios.append(
+            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
+                                 _transport=PyCurlTransport,)),)
+        if tests.HTTPSServerFeature.available():
             from bzrlib.tests import (
                 ssl_certs,
                 )
@@ -172,13 +175,12 @@
                         base, _from_transport)
                     self.cabundle = str(ssl_certs.build_path('ca.crt'))
 
-            act_transport_scenarios.append(
-                ('pycurl', dict(_transport=HTTPS_pycurl_transport,)))
+            activity_scenarios.append(
+                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
+                                      _transport=HTTPS_pycurl_transport,)),)
 
-    tpact_scenarios = tests.multiply_scenarios(
-        tests.multiply_scenarios(act_transport_scenarios,
-                                 protocol_scenarios),
-        activity_scenarios)
+    tpact_scenarios = tests.multiply_scenarios(activity_scenarios,
+                                               protocol_scenarios)
     tests.multiply_tests(tpact_tests, tpact_scenarios, result)
 
     # No parametrization for the remaining tests