Merge lp:~jelmer/bzr/import-tariff-test-case into lp:bzr

[Jelmer Vernooij]

Split out ImportTariffTestCase so it can be used by plugins.

Split out ImportTariffTestCase so it can be used by plugins.

I wonder if bzrlib.tests.test_import_tariff is the right place for this; perhaps it should be moved to bzrlib.tests if it's going to be used by others?

[Vincent Ladeuil (vila)]

[needsfixing] If ImportTariffTestCase is the preferred way to add such tests for plugins the doc string should stay there I think.

[thinking out loud] There are several places where this class may be defined: in test_import_tariff, in tests itself or in tests.fixtures.

tests itself sounds to broad for such focused tests and we don't have test classes in fixtures (and that may not be a good fit either).

I'll tend to leave the class in test_import_tariff.

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

On Mon, 2011-06-06 at 11:45 +0000, Vincent Ladeuil wrote:
> Review: Needs Fixing
> [needsfixing] If ImportTariffTestCase is the preferred way to add such tests for plugins the doc string should stay there I think.
Fixed.

> [thinking out loud] There are several places where this class may be defined: in test_import_tariff, in tests itself or in tests.fixtures.
>
> tests itself sounds to broad for such focused tests and we don't have test classes in fixtures (and that may not be a good fit either).
>
> I'll tend to leave the class in test_import_tariff.
Works for me, I'll leave it there.

Thanks for the review. :)

Cheers,

Jelmer

=== modified file 'bzrlib/tests/test_import_tariff.py'
--- bzrlib/tests/test_import_tariff.py	2011-06-01 10:03:46 +0000
+++ bzrlib/tests/test_import_tariff.py	2011-06-06 12:01:25 +0000
@@ -53,7 +53,7 @@
     ]
 
 
-class TestImportTariffs(TestCaseWithTransport):
+class ImportTariffTestCase(TestCaseWithTransport):
     """Check how many modules are loaded for some representative scenarios.
 
     See the Testing Guide in the developer documentation for more explanation.
@@ -72,7 +72,7 @@
         for name in ('BZR_PLUGIN_PATH', 'BZR_DISABLE_PLUGINS', 'BZR_PLUGINS_AT'
                      ):
             self.preserved_env_vars[name] = os.environ.get(name)
-        super(TestImportTariffs, self).setUp()
+        super(ImportTariffTestCase, self).setUp()
 
     def start_bzr_subprocess_with_import_check(self, args, stderr_file=None):
         """Run a bzr process and capture the imports.
@@ -141,6 +141,10 @@
         self.finish_bzr_subprocess_with_import_check(process, args,
             forbidden_imports)
 
+
+class TestImportTariffs(ImportTariffTestCase):
+    """Basic import tariff tests for some common bzr commands"""
+
     def test_import_tariffs_working(self):
         # check some guaranteed-true and false imports to be sure we're
         # measuring correctly

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-06-01 13:43:12 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-06-06 12:01:25 +0000
@@ -93,6 +93,10 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* A `ImportTariffTestCase` base class has been added in
+  ``bzrlib.tests.test_import_tariff``, which can be used for import tariff
+  tests in plugins. (Jelmer Vernooij, #793465)
+
 * Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
   more output than fits in the default buffer.  This was happening on the
   Windows buildslave, and could easily happen in other circumstances where