Merge lp:~vila/bzr/687315-lazr-uri into lp:bzr

[Vincent Ladeuil]

Tests requiring lazr.uri should check for its presence

Some test from the launchpad plugins rightly check for the
launchpadlib presence or are skipped.

Some of them still fail if some launchpadlib dependencies are not
present, namely lazr.uri.

This fixes bug #687315 by adding a lazr.uri test feature and uses
it where appropriate.

[John A Meinel (jameinel)]

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

On 12/8/2010 7:40 AM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/687315-lazr-uri into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #687315 some tests from the launchpad plugin requires lazr.uri
> https://bugs.launchpad.net/bugs/687315
>
>
> Some test from the launchpad plugins rightly check for the
> launchpadlib presence or are skipped.
>
> Some of them still fail if some launchpadlib dependencies are not
> present, namely lazr.uri.
>
> This fixes bug #687315 by adding a lazr.uri test feature and uses
> it where appropriate.

 merge: approve

I would have thought you couldn't install launchpadlib without its
dependencies, but no big deal.

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

iEYEARECAAYFAkz/u88ACgkQJdeBCYSNAANG7ACff2Bk8YHeFBpuh1Aj4F0xZSHb
qP4AoJAPN8ZDAAnnizcVPiBFs6Hs1d7o
=3Dwj
-----END PGP SIGNATURE-----

review: Approve

[Vincent Ladeuil (vila)]

> I would have thought you couldn't install launchpadlib without its
> dependencies, but no big deal.

Indeed. The babune setup includes a system-wide installed bzr *and* libraries installed as a side-effect. They are incomplete and led me to think that launchpadlib could be made to work without some dependencies which is wrong.

I've re-targeted bug #687315 to the bzr-mac-installers project instead.

Unmerged revisions

5564. By Vincent Ladeuil on 2010-12-08

Tests requiring lazr.uri should check for its presence

=== 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	2010-12-08 13:41:52 +0000
@@ -25,12 +25,17 @@
 
 
 launchpadlib_feature = ModuleAvailableFeature('launchpadlib')
+# launchpadlib internally requires lazr.uri for some use cases (needed by the
+# tests but not encountered in most plugin uses). This allows tests to be
+# skipped on platforms that provides lanchpadlib itself but fail to provide its
+# dependencies.
+lazr_uri_feature = ModuleAvailableFeature('lazr.uri')
 
 
 class TestDependencyManagement(TestCase):
     """Tests for managing the dependency on launchpadlib."""
 
-    _test_needs_features = [launchpadlib_feature]
+    _test_needs_features = [launchpadlib_feature, lazr_uri_feature]
 
     def setUp(self):
         TestCase.setUp(self)
@@ -72,7 +77,7 @@
 class TestCacheDirectory(TestCase):
     """Tests for get_cache_directory."""
 
-    _test_needs_features = [launchpadlib_feature]
+    _test_needs_features = [launchpadlib_feature, lazr_uri_feature]
 
     def test_get_cache_directory(self):
         # get_cache_directory returns the path to a directory inside the

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2010-12-07 16:27:49 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2010-12-08 13:41:52 +0000
@@ -64,6 +64,9 @@
 * Catch exceptions related to bug #637821 during test cleanup to avoid
   spurious failures. (Vincent Ladeuil, #686008).
 
+* Define a test feature for the ``lazr.uri`` ``launchpadlib`` dependency to
+  avoid spurious test failures. (Vincent Ladeuil, #687315)
+
 * ``TestDebuntuExpansions`` was escaping the test isolation by calling the
   wrong base class ``setUp``. (Vincent Ladeuil, #684622)