Merge lp:~cjwatson/launchpadlib/dogfood-uri into lp:launchpadlib

Proposed by Colin Watson
Status: Merged
Approved by: William Grant
Approved revision: 137
Merged at revision: 136
Proposed branch: lp:~cjwatson/launchpadlib/dogfood-uri
Merge into: lp:launchpadlib
Diff against target: 33 lines (+3/-3)
2 files modified
src/launchpadlib/tests/test_launchpad.py (+1/-1)
src/launchpadlib/uris.py (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpadlib/dogfood-uri
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+219189@code.launchpad.net

Commit message

Update the dogfood service root to match its new hostnames.

Description of the change

Update the dogfood service root to match its new hostnames.

I fixed a duplicate test name along the way.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/launchpadlib/tests/test_launchpad.py'
2--- src/launchpadlib/tests/test_launchpad.py 2011-09-15 11:08:54 +0000
3+++ src/launchpadlib/tests/test_launchpad.py 2014-05-12 13:28:37 +0000
4@@ -96,7 +96,7 @@
5 self.assertEqual(uris.lookup_service_root('edge'),
6 uris.lookup_service_root('production'))
7
8- def test_edge_service_root_is_production(self):
9+ def test_edge_web_root_is_production(self):
10 # The edge server no longer exists, so if the client wants
11 # edge we give them production.
12 with self.edge_deprecation_error():
13
14=== modified file 'src/launchpadlib/uris.py'
15--- src/launchpadlib/uris.py 2011-02-15 12:03:58 +0000
16+++ src/launchpadlib/uris.py 2014-05-12 13:28:37 +0000
17@@ -35,14 +35,14 @@
18 QASTAGING_SERVICE_ROOT = 'https://api.qastaging.launchpad.net/'
19 STAGING_SERVICE_ROOT = 'https://api.staging.launchpad.net/'
20 DEV_SERVICE_ROOT = 'https://api.launchpad.dev/'
21-DOGFOOD_SERVICE_ROOT = 'https://api.dogfood.launchpad.net/'
22+DOGFOOD_SERVICE_ROOT = 'https://api.dogfood.paddev.net/'
23 TEST_DEV_SERVICE_ROOT = 'http://api.launchpad.dev:8085/'
24
25 LPNET_WEB_ROOT = 'https://launchpad.net/'
26 QASTAGING_WEB_ROOT = 'https://qastaging.launchpad.net/'
27 STAGING_WEB_ROOT = 'https://staging.launchpad.net/'
28 DEV_WEB_ROOT = 'https://launchpad.dev/'
29-DOGFOOD_WEB_ROOT = 'https://dogfood.launchpad.net/'
30+DOGFOOD_WEB_ROOT = 'https://dogfood.paddev.net/'
31 TEST_DEV_WEB_ROOT = 'http://launchpad.dev:8085/'
32
33 # If you use EDGE_SERVICE_ROOT, or its alias, or the equivalent

Subscribers

People subscribed via source and target branches