1
=== modified file 'lpland.py'
2
--- lpland.py	2010-01-20 06:29:44 +0000
3
+++ lpland.py	2010-03-31 14:45:33 +0000
4
@@ -18,8 +18,10 @@
5
18
18
6
19
import os
19
import os
7
20
20
10
21
from launchpadlib.launchpad import (
21
from launchpadlib.launchpad import Launchpad
11
22
    Launchpad, EDGE_SERVICE_ROOT, STAGING_SERVICE_ROOT)
22
from launchpadlib.uris import (
12
23
    DEV_SERVICE_ROOT, EDGE_SERVICE_ROOT,
13
24
    LPNET_SERVICE_ROOT, STAGING_SERVICE_ROOT)
14
23
from lazr.uri import URI
25
from lazr.uri import URI
15
24
from bzrlib import msgeditor
26
from bzrlib import msgeditor
16
25
from bzrlib.errors import BzrCommandError
27
from bzrlib.errors import BzrCommandError
17
@@ -27,13 +29,6 @@
18
27
from bzrlib import smtp_connection
29
from bzrlib import smtp_connection
19
28
30
20
29
31
21
30
# XXX: JonathanLange 2009-09-24: Both of these are available in more recent
22
31
# versions of launchpadlib. When we start using such versions, we should
23
32
# instead import these from launchpadlib.
24
33
DEV_SERVICE_ROOT = 'https://api.launchpad.dev/beta/'
25
34
LPNET_SERVICE_ROOT = 'https://api.launchpad.net/beta/'
26
35
27
36
28
37
class MissingReviewError(Exception):
32
class MissingReviewError(Exception):
29
38
    """Raised when we try to get a review message without enough reviewers."""
33
    """Raised when we try to get a review message without enough reviewers."""
30
39
34
31
40
35
32
=== modified file 'test_lpland.py'
33
--- test_lpland.py	2010-01-21 23:06:56 +0000
34
+++ test_lpland.py	2010-03-31 14:45:33 +0000
35
@@ -7,7 +7,9 @@
36
7
7
37
8
import unittest
8
import unittest
38
9
9
40
10
from launchpadlib.launchpad import EDGE_SERVICE_ROOT, STAGING_SERVICE_ROOT
10
from launchpadlib.uris import (
41
11
    DEV_SERVICE_ROOT, EDGE_SERVICE_ROOT, LPNET_SERVICE_ROOT,
42
12
    STAGING_SERVICE_ROOT)
43
11
13
44
12
from bzrlib.plugins.pqm.lpland import (
14
from bzrlib.plugins.pqm.lpland import (
45
13
    get_bazaar_host, get_bugs_clause, get_reviewer_clause,
15
    get_bazaar_host, get_bugs_clause, get_reviewer_clause,
46
@@ -169,8 +171,7 @@
47
169
    def test_dev_service(self):
171
    def test_dev_service(self):
48
170
        # The Bazaar host for the dev service is bazaar.launchpad.dev.
172
        # The Bazaar host for the dev service is bazaar.launchpad.dev.
49
171
        self.assertEqual(
173
        self.assertEqual(
52
172
            'bazaar.launchpad.dev',
174
            'bazaar.launchpad.dev', get_bazaar_host(DEV_SERVICE_ROOT))
51
173
            get_bazaar_host('https://api.launchpad.dev/beta/'))
53
174
175
54
175
    def test_edge_service(self):
176
    def test_edge_service(self):
55
176
        # The Bazaar host for the edge service is bazaar.launchpad.net, since
177
        # The Bazaar host for the edge service is bazaar.launchpad.net, since
56
@@ -181,8 +182,7 @@
57
181
    def test_production_service(self):
182
    def test_production_service(self):
58
182
        # The Bazaar host for the production service is bazaar.launchpad.net.
183
        # The Bazaar host for the production service is bazaar.launchpad.net.
59
183
        self.assertEqual(
184
        self.assertEqual(
62
184
            'bazaar.launchpad.net',
185
            'bazaar.launchpad.net', get_bazaar_host(LPNET_SERVICE_ROOT))
61
185
            get_bazaar_host('https://api.launchpad.net/beta/'))
63
186
186
64
187
    def test_staging_service(self):
187
    def test_staging_service(self):
65
188
        # The Bazaar host for the staging service is
188
        # The Bazaar host for the staging service is
Status:	Merged
Merged at revision:	not available
Proposed branch:	lp:~james-w/bzr-pqm/fix-service-roots
Merge into:	lp:bzr-pqm
Diff against target:	65 lines (+9/-14) 2 files modified lpland.py (+4/-9) test_lpland.py (+5/-5)
To merge this branch:	bzr merge lp:~james-w/bzr-pqm/fix-service-roots
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Martin Pool (community)		2010-03-31	Approve on 2010-04-01
Review via email: mp+22540@code.launchpad.net