Rev 4697: Simplified and claried as per Robert's review. in file:///home/vila/src/bzr/bugs/430749-no-extensions-warning/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/430749-no-extensions-warning/

------------------------------------------------------------
revno: 4697
revision-id: v.ladeuil+lp at free.fr-20090917095129-rb6pfjeb3xqajci2
parent: v.ladeuil+lp at free.fr-20090917070901-dse23w0f80r81q20
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 430749-no-extensions-warning
timestamp: Thu 2009-09-17 11:51:29 +0200
message:
  Simplified and claried as per Robert's review.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-09-14 02:15:45 +0000
+++ b/bzrlib/tests/__init__.py	2009-09-17 09:51:29 +0000
@@ -53,6 +53,7 @@
 from bzrlib import (
     branchbuilder,
     bzrdir,
+    config,
     debug,
     errors,
     hooks,
@@ -2561,6 +2562,14 @@
         super(TestCaseWithTransport, self).setUp()
         self.__vfs_server = None
 
+    def disable_missing_extensions_warning(self):
+        """Some tests expect a precise stderr content.
+
+        There is no point in forcing them to duplicate the extension related
+        warning.
+        """
+        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+
 
 class ChrootedTestCase(TestCaseWithTransport):
     """A support class that provides readonly urls outside the local namespace.

=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- a/bzrlib/tests/blackbox/test_cat.py	2009-09-17 07:09:01 +0000
+++ b/bzrlib/tests/blackbox/test_cat.py	2009-09-17 09:51:29 +0000
@@ -72,7 +72,7 @@
 
     def test_cat_different_id(self):
         """'cat' works with old and new files"""
-        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+        self.disable_missing_extensions_warning()
         tree = self.make_branch_and_tree('.')
         # the files are named after their path in the revision and
         # current trees later in the test case

=== modified file 'bzrlib/tests/blackbox/test_diff.py'
--- a/bzrlib/tests/blackbox/test_diff.py	2009-09-17 07:09:01 +0000
+++ b/bzrlib/tests/blackbox/test_diff.py	2009-09-17 09:51:29 +0000
@@ -355,7 +355,7 @@
 
     def test_external_diff(self):
         """Test that we can spawn an external diff process"""
-        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+        self.disable_missing_extensions_warning()
         # We have to use run_bzr_subprocess, because we need to
         # test writing directly to stdout, (there was a bug in
         # subprocess.py that we had to workaround).

=== modified file 'bzrlib/tests/blackbox/test_locale.py'
--- a/bzrlib/tests/blackbox/test_locale.py	2009-09-17 07:09:01 +0000
+++ b/bzrlib/tests/blackbox/test_locale.py	2009-09-17 09:51:29 +0000
@@ -44,7 +44,7 @@
         self.tree = tree
 
     def test_log_C(self):
-        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+        self.disable_missing_extensions_warning()
         out, err = self.run_bzr_subprocess(
             '--no-aliases --no-plugins log -q --log-format=long tree',
                env_changes={'LANG':'C', 'BZR_PROGRESS_BAR':'none',

=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py	2009-09-17 07:09:01 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py	2009-09-17 09:51:29 +0000
@@ -45,7 +45,7 @@
 
     def setUp(self):
         super(TestBzrServe, self).setUp()
-        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+        self.disable_missing_extensions_warning()
 
     def assertInetServerShutsdownCleanly(self, process):
         """Shutdown the server process looking for errors."""

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-09-17 07:09:01 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-09-17 09:51:29 +0000
@@ -2370,7 +2370,7 @@
         """finish_bzr_subprocess raises self.failureException if the retcode is
         not the expected one.
         """
-        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+        self.disable_missing_extensions_warning()
         process = self.start_bzr_subprocess(['wait-until-signalled'],
                                             skip_if_plan_to_signal=True)
         self.assertEqual('running\n', process.stdout.readline())