Rev 4765: Delete all references to edge.launchpad.net in code and associated tests. in file:///home/vila/src/bzr/bugs/583667-lp-no-edge/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Nov 26 14:25:18 GMT 2010
At file:///home/vila/src/bzr/bugs/583667-lp-no-edge/
------------------------------------------------------------
revno: 4765
revision-id: v.ladeuil+lp at free.fr-20101126142518-8zqoyblxd65yuma9
parent: v.ladeuil+lp at free.fr-20101126140637-2voygvjtlfvrqs0q
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 583667-lp-no-edge
timestamp: Fri 2010-11-26 15:25:18 +0100
message:
Delete all references to edge.launchpad.net in code and associated tests.
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- a/bzrlib/plugins/launchpad/lp_registration.py 2009-07-04 16:22:16 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py 2010-11-26 14:25:18 +0000
@@ -61,7 +61,6 @@
LAUNCHPAD_DOMAINS = {
'production': 'launchpad.net',
- 'edge': 'edge.launchpad.net',
'staging': 'staging.launchpad.net',
'demo': 'demo.launchpad.net',
'dev': 'launchpad.dev',
@@ -73,11 +72,9 @@
for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
- # We use edge as the default because:
- # Beta users get redirected to it
- # All users can use it
- # There is a bug in the launchpad side where redirection causes an OOPS.
- DEFAULT_INSTANCE = 'edge'
+ # We use production as the default because edge has been deprecated circa
+ # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
+ DEFAULT_INSTANCE = 'production'
DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
transport = None
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- a/bzrlib/plugins/launchpad/test_lp_directory.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_directory.py 2010-11-26 14:25:18 +0000
@@ -61,7 +61,7 @@
self.assertEquals('http://bazaar.launchpad.net/~apt/apt/devel',
directory._resolve('lp:apt', factory))
# Make sure that resolve went to the production server.
- self.assertEquals('https://xmlrpc.edge.launchpad.net/bazaar/',
+ self.assertEquals('https://xmlrpc.launchpad.net/bazaar/',
factory._service_url)
def test_staging(self):
=== modified file 'bzrlib/plugins/launchpad/test_lp_open.py'
--- a/bzrlib/plugins/launchpad/test_lp_open.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_open.py 2010-11-26 14:25:18 +0000
@@ -53,7 +53,7 @@
branch.set_public_branch(
'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
self.assertEqual(
- ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
+ ['Opening https://code.launchpad.net/~foo/bar/baz in web '
'browser'],
self.run_open('lp'))
@@ -64,7 +64,7 @@
branch.set_push_location(
'bzr+ssh://bazaar.launchpad.net/~foo/bar/push')
self.assertEqual(
- ['Opening https://code.edge.launchpad.net/~foo/bar/public in web '
+ ['Opening https://code.launchpad.net/~foo/bar/public in web '
'browser'],
self.run_open('lp'))
@@ -75,7 +75,7 @@
branch.set_push_location(
'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
self.assertEqual(
- ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
+ ['Opening https://code.launchpad.net/~foo/bar/baz in web '
'browser'],
self.run_open('lp'))
@@ -84,6 +84,6 @@
# location and no push location, then just try to look up the
# Launchpad page for that URL.
self.assertEqual(
- ['Opening https://code.edge.launchpad.net/~foo/bar/baz in web '
+ ['Opening https://code.launchpad.net/~foo/bar/baz in web '
'browser'],
self.run_open('bzr+ssh://bazaar.launchpad.net/~foo/bar/baz'))
=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py'
--- a/bzrlib/plugins/launchpad/test_lp_service.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_service.py 2010-11-26 14:25:18 +0000
@@ -54,11 +54,6 @@
self.assertEqual('https://xmlrpc.staging.launchpad.net/bazaar/',
service.service_url)
- def test_edge_service(self):
- service = LaunchpadService(lp_instance='edge')
- self.assertEqual('https://xmlrpc.edge.launchpad.net/bazaar/',
- service.service_url)
-
def test_dev_service(self):
service = LaunchpadService(lp_instance='dev')
self.assertEqual('https://xmlrpc.launchpad.dev/bazaar/',
@@ -97,7 +92,7 @@
web_url = service.get_web_url_from_branch_url(
'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
self.assertEqual(
- 'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
+ 'https://code.launchpad.net/~foo/bar/baz', web_url)
def test_product_bzr_ssh_url(self):
service = LaunchpadService(lp_instance='production')
@@ -152,7 +147,7 @@
dict(urls=['http://bazaar.launchpad.net/~foo/bar/baz']))
web_url = service.get_web_url_from_branch_url('lp:foo', factory)
self.assertEqual(
- 'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
+ 'https://code.launchpad.net/~foo/bar/baz', web_url)
def test_lp_branch_fault(self):
service = LaunchpadService()
@@ -171,13 +166,6 @@
self.assertEqual(
'https://code.staging.launchpad.net/~foo/bar/baz', web_url)
- def test_edge_url(self):
- service = LaunchpadService(lp_instance='edge')
- web_url = service.get_web_url_from_branch_url(
- 'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
- self.assertEqual(
- 'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
-
def test_dev_url(self):
service = LaunchpadService(lp_instance='dev')
web_url = service.get_web_url_from_branch_url(
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- a/bzrlib/plugins/launchpad/test_register.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py 2010-11-26 14:25:18 +0000
@@ -175,7 +175,7 @@
self.assertEquals(out, 'Branch registered.\n')
def test_onto_transport(self):
- """Test how the request is sent by transmitting across a mock Transport"""
+ """How the request is sent by transmitting across a mock Transport"""
# use a real transport, but intercept at the http/xml layer
transport = InstrumentedXMLRPCTransport(self, expect_auth=True)
service = LaunchpadService(transport)
@@ -188,7 +188,7 @@
'author at launchpad.net',
'product')
rego.submit(service)
- self.assertEquals(transport.connected_host, 'xmlrpc.edge.launchpad.net')
+ self.assertEquals(transport.connected_host, 'xmlrpc.launchpad.net')
self.assertEquals(len(transport.sent_params), 6)
self.assertEquals(transport.sent_params,
('http://test-server.com/bzr/branch', # branch_url
@@ -200,12 +200,12 @@
self.assertTrue(transport.got_request)
def test_onto_transport_unauthenticated(self):
- """Test how an unauthenticated request is transmitted across a mock Transport"""
+ """An unauthenticated request is transmitted across a mock Transport"""
transport = InstrumentedXMLRPCTransport(self, expect_auth=False)
service = LaunchpadService(transport)
resolve = ResolveLaunchpadPathRequest('bzr')
resolve.submit(service)
- self.assertEquals(transport.connected_host, 'xmlrpc.edge.launchpad.net')
+ self.assertEquals(transport.connected_host, 'xmlrpc.launchpad.net')
self.assertEquals(len(transport.sent_params), 1)
self.assertEquals(transport.sent_params, ('bzr', ))
self.assertTrue(transport.got_request)
More information about the bazaar-commits
mailing list