Rev 5305: Pass BZR_PLUGINS_AT and BZR_DISABLE_PLINGS to the subprocess fpr test_import_tariff in file:///home/vila/src/bzr/bugs/595587-fix-test-tariff/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/595587-fix-test-tariff/

------------------------------------------------------------
revno: 5305
revision-id: v.ladeuil+lp at free.fr-20100617165426-741tbmgwi62a9zub
parent: pqm at pqm.ubuntu.com-20100617145103-a1758eng4ujn3h4d
fixes bug(s): https://launchpad.net/bugs/595587
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 595587-fix-test-tariff
timestamp: Thu 2010-06-17 18:54:26 +0200
message:
  Pass BZR_PLUGINS_AT and BZR_DISABLE_PLINGS to the subprocess fpr test_import_tariff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-06-17 11:52:13 +0000
+++ b/NEWS	2010-06-17 16:54:26 +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'
--- a/bzrlib/tests/test_import_tariff.py	2010-06-04 03:09:35 +0000
+++ b/bzrlib/tests/test_import_tariff.py	2010-06-17 16:54:26 +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