Merge lp:~vila/bzr/684662-fugitive-launchpad-plugin-tests into lp:bzr

[Vincent Ladeuil]

Catch the fugitive TestDebuntuExpansions tests and bring them back in the isolation jail

Both funny and scaring.

As mentioned in bug #684662, the TestDebuntuExpansions tests
managed to evade from the isolation jail by calling the wrong
setUp method.

I didn't precisely diagnosed why the tests were passing but
InvalidURL was probalby raised because there was no
launchpad_username set on the babune windows slave before my
recent tweaks.

[Martin Packman (gz)]

From the original review it seems there wasn't anything deliberate in this:
<https://code.launchpad.net/~barry/bzr/609186-shortcuts/+merge/37787>

review: Approve

[Vincent Ladeuil (vila)]

Oh, of course I didn't imply it was deliberate. Thanks for the review !

[Vincent Ladeuil (vila)]

sent to pqm by email

[John A Meinel (jameinel)]

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

On 12/3/2010 6:54 AM, Vincent Ladeuil wrote:
> Oh, of course I didn't imply it was deliberate. Thanks for the review !

I wonder if we could add a tearDown() step that checked that setUp() was
called? Just a thought.

John
=:->

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

iEYEARECAAYFAkz5D9sACgkQJdeBCYSNAAN7sACeP03u7GXYRSDS8szGP3ug1dj/
oogAoI/g6ilOHGQe3cXdstU2JK2917do
=bXmb
-----END PGP SIGNATURE-----

=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py	2010-12-02 10:41:05 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py	2010-12-03 11:24:39 +0000
@@ -361,7 +361,7 @@
     """Test expansions for ubuntu: and debianlp: schemes."""
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestDebuntuExpansions, self).setUp()
         self.directory = LaunchpadDirectory()
 
     def _make_factory(self, package='foo', distro='ubuntu', series=None):

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2010-12-03 07:52:35 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2010-12-03 11:24:39 +0000
@@ -61,6 +61,8 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* ``TestDebuntuExpansions`` was escaping the test isolation by calling the
+  wrong base class ``setUp``. (Vincent Ladeuil, #684622)
 
 bzr 2.3b4
 #########