← Back to branch summary

~vila/bzr/pycurl-https-activity-test-failures

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-27 13:59:47 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20090527135947-wwclbmut68jkivml
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).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
149
149
                TestActivity,
150
150
                )))
151
151
    activity_scenarios = [
152
 
        ('http', dict(_activity_server=ActivityHTTPServer)),
153
 
        ]
154
 
    act_transport_scenarios = [
155
 
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,)),
 
152
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
 
153
                             _transport=_urllib.HttpTransport_urllib,)),
156
154
        ]
157
155
    if tests.HTTPSServerFeature.available():
158
156
        activity_scenarios.append(
159
 
            ('https', dict(_activity_server=ActivityHTTPSServer)))
160
 
        if pycurl_present:
 
157
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
 
158
                                  _transport=_urllib.HttpTransport_urllib,)),)
 
159
    if pycurl_present:
 
160
        activity_scenarios.append(
 
161
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
 
162
                                 _transport=PyCurlTransport,)),)
 
163
        if tests.HTTPSServerFeature.available():
161
164
            from bzrlib.tests import (
162
165
                ssl_certs,
163
166
                )
172
175
                        base, _from_transport)
173
176
                    self.cabundle = str(ssl_certs.build_path('ca.crt'))
174
177
 
175
 
            act_transport_scenarios.append(
176
 
                ('pycurl', dict(_transport=HTTPS_pycurl_transport,)))
 
178
            activity_scenarios.append(
 
179
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
 
180
                                      _transport=HTTPS_pycurl_transport,)),)
177
181
 
178
 
    tpact_scenarios = tests.multiply_scenarios(
179
 
        tests.multiply_scenarios(act_transport_scenarios,
180
 
                                 protocol_scenarios),
181
 
        activity_scenarios)
 
182
    tpact_scenarios = tests.multiply_scenarios(activity_scenarios,
 
183
                                               protocol_scenarios)
182
184
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
183
185
 
184
186
    # No parametrization for the remaining tests