Merge lp:~garyvdm/bzr/test_no_pyqt_import into lp:bzr

[Gary van der Merwe]

Check the PyQt4 is not imported for bzr status.

This makes test_import_tariff.TestImportTariffs.test_simple_local check that PyQt4 is not imported when bzr st is run.

It also has a drive by fix to make test_import_tariff.TestImportTariffs.test_simple_local pass the new 'BZR_DISABLE_PLUGINS' and 'BZR_PLUGINS_AT' envars to the supprocess used in the test.

(This should probably be move to run_bzr_subprocess, but I'll do that in another proposal.)

[Martin Packman (gz)]

Small change, and altered test passes here. Shouldn't this sort of thing be really be done in the qbzr tests by inheriting from TestImportTariffs though? This way at least gets it tested now, rather than waiting for automated plugin tests though.

review: Approve

[Gary van der Merwe (garyvdm)]

On Mon, Jun 7, 2010 at 11:01 PM, Martin [gz] <email address hidden> wrote:
> Shouldn't this sort of thing be really be done in the qbzr tests by inheriting from TestImportTariffs though? This way at least gets it tested now, rather than waiting for automated plugin tests though.

That makes more sense. I'll do that rather.

[John A Meinel (jameinel)]

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

Gary van der Merwe wrote:
> Gary van der Merwe has proposed merging lp:~garyvdm/bzr/test_no_pyqt_import into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> This makes test_import_tariff.TestImportTariffs.test_simple_local check that PyQt4 is not imported when bzr st is run.
>
> It also has a drive by fix to make test_import_tariff.TestImportTariffs.test_simple_local pass the new 'BZR_DISABLE_PLUGINS' and 'BZR_PLUGINS_AT' envars to the supprocess used in the test.
>
> (This should probably be move to run_bzr_subprocess, but I'll do that in another proposal.)
>

Honestly, I would be fine with always asserting this, and not just when
qbzr is installed. :)

John
=:->

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

iEYEARECAAYFAkwNY3sACgkQJdeBCYSNAANmDgCghhPZ12ZvjTvIGFYcyVHtzzB3
4PgAnA8ENYVPO0DIza575mYM1+4r/hI6
=+Uqs
-----END PGP SIGNATURE-----

Unmerged revisions

5284. By Gary van der Merwe on 2010-06-04

Check the PyQt4 is not imported for status.

=== modified file 'NEWS'
--- NEWS	2010-06-04 11:26:53 +0000
+++ NEWS	2010-06-04 13:55:38 +0000
@@ -65,6 +65,9 @@
 Testing
 *******
 
+* test_import_tariff.TestImportTariffs.test_simple_local now checks that PyQt4
+  is not imported. (Gary van der Merwe)
+
 
 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-04 13:55:38 +0000
@@ -55,7 +55,8 @@
         # 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', 'HOME',
+                     'BZR_DISABLE_PLUGINS', 'BZR_PLUGINS_AT']:
             env_changes[name] = self._old_env.get(name)
         out, err = self.run_bzr_subprocess(args,
             allow_plugins=(not are_plugins_disabled()),
@@ -102,6 +103,7 @@
             'kerberos',
             'smtplib',
             'tarfile',
+            'PyQt4',
             ])
         # TODO: similar test for repository-only operations, checking we avoid
         # loading wt-specific stuff