← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
128
128
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
129
129
                            _transport=_urllib.HttpTransport_urllib,)),
130
130
        ]
131
 
    if tests.HTTPSServerFeature.available():
 
131
    if features.HTTPSServerFeature.available():
132
132
        activity_scenarios.append(
133
133
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
134
134
                                _transport=_urllib.HttpTransport_urllib,)),)
136
136
        activity_scenarios.append(
137
137
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
138
138
                                _transport=PyCurlTransport,)),)
139
 
        if tests.HTTPSServerFeature.available():
 
139
        if features.HTTPSServerFeature.available():
140
140
            from bzrlib.tests import (
141
141
                ssl_certs,
142
142
                )
1767
1767
                                     http_utils.ProxyDigestAuthServer):
1768
1768
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1769
1769
        if self._testing_pycurl():
1770
 
            raise tests.KnownFailure(
 
1770
            self.knownFailure(
1771
1771
                'pycurl does not handle a nonce change')
1772
1772
        self.server.add_user('joe', 'foo')
1773
1773
        t = self.get_user_transport('joe', 'foo')
1855
1855
        if self._testing_pycurl():
1856
1856
            import pycurl
1857
1857
            if pycurl.version_info()[1] < '7.16.0':
1858
 
                raise tests.KnownFailure(
 
1858
                self.knownFailure(
1859
1859
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1860
1860
        super(TestProxyAuth, self).test_empty_pass()
1861
1861
 
2086
2086
    pass
2087
2087
 
2088
2088
 
2089
 
if tests.HTTPSServerFeature.available():
 
2089
if features.HTTPSServerFeature.available():
2090
2090
    from bzrlib.tests import https_server
2091
2091
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
2092
2092
        pass