Merge lp:~vila/bzr/pycurl-https-activity-test-failures into lp:~bzr/bzr/trunk-old

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

Andrew showed me that the combo python2.6/pycurl was failing some tests.

Here is the fix.

[Martin Pool (mbp)]

43 + tpact_scenarios = tests.multiply_scenarios(act_transport_scenarios,
44 + protocol_scenarios)
45 + tpact_scenarios = tests.multiply_scenarios(tpact_scenarios,
46 + activity_scenarios)

It's cleaner to avoid multiple assignment of similar values to the same variable. Maybe use nested calls?

review: Approve

=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py	2009-05-27 13:31:41 +0000
+++ bzrlib/tests/test_http.py	2009-05-27 18:35:24 +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