← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/test_lp_directory.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
19
19
import os
20
20
import xmlrpclib
21
21
 
 
22
import bzrlib
22
23
from bzrlib import (
23
24
    debug,
24
25
    errors,
29
30
from bzrlib.directory_service import directories
30
31
from bzrlib.tests import (
31
32
    features,
 
33
    ssl_certs,
32
34
    TestCaseInTempDir,
33
35
    TestCaseWithMemoryTransport
34
36
)
121
123
        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu',
122
124
                           'lp:ubuntu')
123
125
 
 
126
    def test_ubuntu_invalid(self):
 
127
        """Invalid ubuntu urls don't crash.
 
128
 
 
129
        :seealso: http://pad.lv/843900
 
130
        """
 
131
        # This ought to be natty-updates.
 
132
        self.assertRaises(errors.InvalidURL,
 
133
            self.assertResolve,
 
134
            '',
 
135
            'ubuntu:natty/updates/smartpm')
 
136
 
124
137
    def test_ubuntu_apt(self):
125
138
        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/apt',
126
139
                           'lp:ubuntu/apt')
441
454
        tests.TestCase.setUp(self)
442
455
        self.server = self.server_class()
443
456
        self.server.start_server()
 
457
        self.addCleanup(self.server.stop_server)
444
458
        # Ensure we don't clobber env
445
459
        self.overrideEnv('BZR_LP_XMLRPC_URL', None)
446
 
 
447
 
    def tearDown(self):
448
 
        self.server.stop_server()
449
 
        tests.TestCase.tearDown(self)
 
460
        # Ensure we use the right certificates for https.
 
461
        # FIXME: There should be a better way but the only alternative I can
 
462
        # think of involves carrying the ca_certs through the lp_registration
 
463
        # infrastructure to _urllib2_wrappers... -- vila 2012-01-20
 
464
        bzrlib.global_state.cmdline_overrides._from_cmdline(
 
465
            ['ssl.ca_certs=%s' % ssl_certs.build_path('ca.crt')])
450
466
 
451
467
    def set_canned_response(self, server, path):
452
468
        response_format = '''HTTP/1.1 200 OK\r