Merge lp:~vila/bzr/595587-fix-test-tariff into lp:bzr

[Vincent Ladeuil]

test_import_tariff should respect BZR_PLUGINS_AT and BZR_DISABLE_PLUGINS

Quick fix, no tests, comments welcome if they are needed.
I have tested the BZR_PLUGINS_AT, the BZR_DISABLE_PLUGINS sounds necessary too (if only for diagnostic purposes) but I didn't tested it.

[John A Meinel (jameinel)]

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

Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/595587-fix-test-tariff into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #595587 test_import_tariff doesn't respect BZR_PLUGINS_AT not BZR_DISABLE_PLUGINS
> https://bugs.launchpad.net/bugs/595587
>
>
> Quick fix, no tests, comments welcome if they are needed.
> I have tested the BZR_PLUGINS_AT, the BZR_DISABLE_PLUGINS sounds necessary too (if only for diagnostic purposes) but I didn't tested it.
>

 merge: approve

John
=:->

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

iEYEARECAAYFAkwaWxwACgkQJdeBCYSNAANwUgCgiUEcZncVkeirLeHsmV8Ub/f1
2poAn3Ic/r0uyc4idlIWAW+f8UMbHH+Q
=ClDD
-----END PGP SIGNATURE-----

review: Approve

[Robert Collins (lifeless)]

it would be nice to have just one list of such variables. easy low hanging fruit to fix that.

=== modified file 'NEWS'
--- NEWS	2010-06-17 11:52:13 +0000
+++ NEWS	2010-06-17 16:58:28 +0000
@@ -131,6 +131,8 @@
 Testing
 *******
 
+* ``test_import_tariff`` now respects BZR_PLUGINS_AT and BZR_PLUGINS_DISABLE.
+  (Vincent Ladeuil, #595587)
 
 bzr 2.2b3
 #########
 
=== modified file 'bzrlib/tests/test_import_tariff.py'
--- bzrlib/tests/test_import_tariff.py	2010-06-04 03:09:35 +0000
+++ bzrlib/tests/test_import_tariff.py	2010-06-17 16:58:28 +0000
@@ -55,13 +55,15 @@
         # explicitly do want to test against things installed there, therefore
         # we pass it through.
         env_changes = dict(PYTHONVERBOSE='1')
-        for name in ['BZR_HOME', 'BZR_PLUGIN_PATH', 'HOME',]:
+        for name in ['BZR_HOME', 'BZR_PLUGIN_PATH',
+                     'BZR_DISABLE_PLUGINS', 'BZR_PLUGINS_AT',
+                     'HOME',]:
             env_changes[name] = self._old_env.get(name)
         out, err = self.run_bzr_subprocess(args,
             allow_plugins=(not are_plugins_disabled()),
             env_changes=env_changes)
 
-        self.addDetail('subprocess_stderr', 
+        self.addDetail('subprocess_stderr',
             content.Content(content.ContentType("text", "plain"),
                 lambda:[err]))
 
@@ -71,7 +73,7 @@
                 bad_modules.append(module_name)
 
         if bad_modules:
-            self.fail("command %r loaded forbidden modules %r" 
+            self.fail("command %r loaded forbidden modules %r"
                 % (args, bad_modules))
         return out, err