Merge lp:~jelmer/bzr/lp-qa-staging into lp:bzr

[Jelmer Vernooij]

Add support for qastaging in the launchpad plugin.

This adds support for lp://qastaging

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/17/2011 12:45 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr/lp-qa-staging into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr/lp-qa-staging/+merge/46515
>
> This adds support for lp://qastaging

     from launchpadlib.uris import LPNET_SERVICE_ROOT
 except ImportError:
     LPNET_SERVICE_ROOT = 'https://api.launchpad.net/beta/'
+try:
+ from launchpadlib.uris import QASTAGING_SERVICE_ROOT
+except ImportError:
+ QASTAGING_SERVICE_ROOT = 'https://api.qastaging.launchpad.net/'

^- These sure look like things that should be done with getattr() rather
than import hacks. Can we change these to:

from launchpadlib import uris

QASTAGING_SERVICE_ROOT = getattr(uris, 'QASTAGING_SERVICE_ROOT',
     'https://api.qastaging.launchpad.net')

etc.

launchpadlib may be doing import time hacks, but I doubt it.

The rest looks good to me. I would make sure you manually tested it, but
otherwise I'm happy.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk011pAACgkQJdeBCYSNAANGrACfc/oUxjzdgBvnVnKj8Cs8VnIf
ZuoAoIIxa+r1h36raJcEdpaKaxUIjz87
=thDm
-----END PGP SIGNATURE-----

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- bzrlib/plugins/launchpad/lp_api.py	2010-12-02 10:41:05 +0000
+++ bzrlib/plugins/launchpad/lp_api.py	2011-01-18 18:53:28 +0000
@@ -47,11 +47,12 @@
     STAGING_SERVICE_ROOT,
     Launchpad,
     )
-try:
-    from launchpadlib.uris import LPNET_SERVICE_ROOT
-except ImportError:
-    LPNET_SERVICE_ROOT = 'https://api.launchpad.net/beta/'
+from launchpadlib import uris
 
+LPNET_SERVICE_ROOT = getattr(uris, 'LPNET_SERVICE_ROOT',
+                             'https://api.launchpad.net/beta/')
+QASTAGING_SERVICE_ROOT = getattr(uris, 'QASTAGING_SERVICE_ROOT',
+                                 'https://api.qastaging.launchpad.net/')
 
 # Declare the minimum version of launchpadlib that we need in order to work.
 # 1.5.1 is the version of launchpadlib packaged in Ubuntu 9.10, the most
@@ -80,6 +81,7 @@
 
 LAUNCHPAD_API_URLS = {
     'production': LPNET_SERVICE_ROOT,
+    'qastaging': QASTAGING_SERVICE_ROOT,
     'staging': STAGING_SERVICE_ROOT,
     'dev': 'https://api.launchpad.dev/beta/',
     }
@@ -189,12 +191,13 @@
     @staticmethod
     def tweak_url(url, launchpad):
         """Adjust a URL to work with staging, if needed."""
-        if str(launchpad._root_uri) != STAGING_SERVICE_ROOT:
-            return url
-        if url is None:
-            return None
-        return url.replace('bazaar.launchpad.net',
-                           'bazaar.staging.launchpad.net')
+        if str(launchpad._root_uri) == STAGING_SERVICE_ROOT:
+            return url.replace('bazaar.launchpad.net',
+                               'bazaar.staging.launchpad.net')
+        elif str(launchpad._root_uri) == QASTAGING_SERVICE_ROOT:
+            return url.replace('bazaar.launchpad.net',
+                               'bazaar.qastaging.launchpad.net')
+        return url
 
     @classmethod
     def from_bzr(cls, launchpad, bzr_branch, create_missing=True):

=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- bzrlib/plugins/launchpad/lp_registration.py	2010-12-02 09:23:10 +0000
+++ bzrlib/plugins/launchpad/lp_registration.py	2011-01-18 18:53:28 +0000
@@ -86,6 +86,7 @@
 
     LAUNCHPAD_DOMAINS = {
         'production': 'launchpad.net',
+        'qastaging': 'qastaging.launchpad.net',
         'staging': 'staging.launchpad.net',
         'demo': 'demo.launchpad.net',
         'dev': 'launchpad.dev',

=== modified file 'bzrlib/plugins/launchpad/test_lp_api.py'
--- bzrlib/plugins/launchpad/test_lp_api.py	2010-03-05 08:55:12 +0000
+++ bzrlib/plugins/launchpad/test_lp_api.py	2011-01-18 18:53:28 +0000
@@ -15,8 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-from bzrlib import commands, config, errors, osutils
-from bzrlib.plugins.launchpad import cmd_launchpad_mirror
+from bzrlib import config, errors, osutils
 from bzrlib.tests import (
     ModuleAvailableFeature,
     TestCase,

=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py	2011-01-10 22:20:12 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py	2011-01-18 18:53:28 +0000
@@ -91,6 +91,19 @@
         self.assertEquals('https://xmlrpc.launchpad.net/bazaar/',
                           factory._service_url)
 
+    def test_qastaging(self):
+        """A launchpad url should map to a http url"""
+        factory = FakeResolveFactory(
+            self, 'apt', dict(urls=[
+                    'http://bazaar.qastaging.launchpad.net/~apt/apt/devel']))
+        url = 'lp://qastaging/apt'
+        directory = LaunchpadDirectory()
+        self.assertEquals('http://bazaar.qastaging.launchpad.net/~apt/apt/devel',
+                          directory._resolve(url, factory))
+        # Make sure that resolve went to the qastaging server.
+        self.assertEquals('https://xmlrpc.qastaging.launchpad.net/bazaar/',
+                          factory._service_url)
+
     def test_staging(self):
         """A launchpad url should map to a http url"""
         factory = FakeResolveFactory(

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-01-15 07:05:45 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-01-18 18:53:28 +0000
@@ -20,6 +20,9 @@
 
 .. New commands, options, etc that users may wish to try out.
 
+* The ``lp:`` directory service now supports Launchpad's QA staging.
+  (Jelmer Vernooij, #667483)
+
 Improvements
 ************