~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Fixed as per review comments.

* bzrlib/tests/test_plugins.py:
(TestDisablePlugin.test_not_loaded,
TestDisablePlugin.test_cannot_import): Update tests.

* bzrlib/tests/__init__.py:
(TestCase._cleanEnvironment): Add BZR_DISABLE_PLUGINS.

* bzrlib/plugin.py:
(set_plugins_path): Use a dedicated BZR_DISABLE_PLUGINS env var
instead of mucking with BZR_PLUGIN_PATH.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1519
1519
            'BZR_PROGRESS_BAR': None,
1520
1520
            'BZR_LOG': None,
1521
1521
            'BZR_PLUGIN_PATH': None,
 
1522
            'BZR_DISABLE_PLUGINS': None,
1522
1523
            'BZR_CONCURRENCY': None,
1523
1524
            # Make sure that any text ui tests are consistent regardless of
1524
1525
            # the environment the test case is run in; you may want tests that