Merge lp:~cjwatson/brz/lp-test-uris into lp:brz

Proposed by Colin Watson on 2020-11-13
Status: Merged
Approved by: Jelmer Vernooij on 2020-11-17
Approved revision: 7523
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~cjwatson/brz/lp-test-uris
Merge into: lp:brz
Diff against target: 60 lines (+9/-9)
3 files modified
breezy/plugins/launchpad/test_lp_directory.py (+2/-2)
breezy/plugins/launchpad/test_lp_service.py (+6/-6)
breezy/plugins/launchpad/uris.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/brz/lp-test-uris
Reviewer Review Type Date Requested Status
Jelmer Vernooij 2020-11-13 Approve on 2020-11-13
Review via email: mp+393711@code.launchpad.net

Commit message

Define a Launchpad 'test' domain rather than 'dev'.

Description of the change

We had to change Launchpad's development setup to use launchpad.test rather than launchpad.dev a while back, since Google bought .dev and added it to HSTS preload lists.

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve
lp:~cjwatson/brz/lp-test-uris updated on 2020-11-17
7523. By Colin Watson on 2020-11-17

Fix test_handles_special_lp.

Colin Watson (cjwatson) wrote :

Could you retry the landing, please? I've fixed the broken test.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/launchpad/test_lp_directory.py'
2--- breezy/plugins/launchpad/test_lp_directory.py 2020-02-07 02:14:30 +0000
3+++ breezy/plugins/launchpad/test_lp_directory.py 2020-11-17 10:58:28 +0000
4@@ -209,8 +209,8 @@
5 'lp:///apt')
6 self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
7 'lp://production/apt')
8- self.assertResolve('bzr+ssh://bazaar.launchpad.dev/+branch/apt',
9- 'lp://dev/apt')
10+ self.assertResolve('bzr+ssh://bazaar.launchpad.test/+branch/apt',
11+ 'lp://test/apt')
12 self.assertResolve('bzr+ssh://bazaar.staging.launchpad.net/+branch/apt',
13 'lp://staging/apt')
14 self.assertResolve('bzr+ssh://bazaar.qastaging.launchpad.net/+branch/apt',
15
16=== modified file 'breezy/plugins/launchpad/test_lp_service.py'
17--- breezy/plugins/launchpad/test_lp_service.py 2020-02-07 02:14:30 +0000
18+++ breezy/plugins/launchpad/test_lp_service.py 2020-11-17 10:58:28 +0000
19@@ -57,9 +57,9 @@
20 self.assertEqual('https://xmlrpc.staging.launchpad.net/bazaar/',
21 service.service_url)
22
23- def test_dev_service(self):
24- service = LaunchpadService(lp_instance='dev')
25- self.assertEqual('https://xmlrpc.launchpad.dev/bazaar/',
26+ def test_test_service(self):
27+ service = LaunchpadService(lp_instance='test')
28+ self.assertEqual('https://xmlrpc.launchpad.test/bazaar/',
29 service.service_url)
30
31 def test_demo_service(self):
32@@ -170,12 +170,12 @@
33 self.assertEqual(
34 'https://code.staging.launchpad.net/~foo/bar/baz', web_url)
35
36- def test_dev_url(self):
37- service = LaunchpadService(lp_instance='dev')
38+ def test_test_url(self):
39+ service = LaunchpadService(lp_instance='test')
40 web_url = service.get_web_url_from_branch_url(
41 'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
42 self.assertEqual(
43- 'https://code.launchpad.dev/~foo/bar/baz', web_url)
44+ 'https://code.launchpad.test/~foo/bar/baz', web_url)
45
46 def test_demo_url(self):
47 service = LaunchpadService(lp_instance='demo')
48
49=== modified file 'breezy/plugins/launchpad/uris.py'
50--- breezy/plugins/launchpad/uris.py 2020-02-18 01:57:45 +0000
51+++ breezy/plugins/launchpad/uris.py 2020-11-17 10:58:28 +0000
52@@ -26,7 +26,7 @@
53 'staging': 'staging.launchpad.net',
54 'qastaging': 'qastaging.launchpad.net',
55 'demo': 'demo.launchpad.net',
56- 'dev': 'launchpad.dev',
57+ 'test': 'launchpad.test',
58 }
59
60 LAUNCHPAD_BAZAAR_DOMAINS = [

Subscribers

People subscribed via source and target branches