Merge lp:~mbp/bzr/656694-verbosity into lp:bzr

[Martin Pool]

reset global verbosity after each command and test

In the course of lp:~mbp/bzr/scripts I hit some trouble with verbosity not being isolated across tests. We should really get rid of it per bug 656694, but this at least removes the test coupling.

[Vincent Ladeuil (vila)]

review: Approve

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2010-08-13 07:56:06 +0000
+++ bzrlib/commands.py	2010-10-08 06:33:45 +0000
@@ -687,7 +687,12 @@
 
         self._setup_outf()
 
-        return self.run(**all_cmd_args)
+        try:
+            return self.run(**all_cmd_args)
+        finally:
+            # reset it, so that other commands run in the same process won't
+            # inherit state
+            trace.set_verbosity_level(0)
 
     def _setup_run(self):
         """Wrap the defined run method on self with a cleanup.

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-10-08 01:43:13 +0000
+++ bzrlib/tests/__init__.py	2010-10-08 06:33:45 +0000
@@ -858,6 +858,10 @@
         self._track_transports()
         self._track_locks()
         self._clear_debug_flags()
+        # Isolate global verbosity level, to make sure it's reproducible
+        # between tests.  We should get rid of this altogether: bug 656694. --
+        # mbp 20101008
+        self.overrideAttr(bzrlib.trace, '_verbosity_level', 0)
 
     def debug(self):
         # debug a frame up.

=== modified file 'bzrlib/tests/test_script.py'
--- bzrlib/tests/test_script.py	2010-09-13 09:00:03 +0000
+++ bzrlib/tests/test_script.py	2010-10-08 06:33:45 +0000
@@ -19,6 +19,7 @@
     commands,
     osutils,
     tests,
+    trace,
     ui,
     )
 from bzrlib.tests import script
@@ -245,6 +246,15 @@
 cat dog "chicken" 'dragon'
 """)
 
+    def test_verbosity_isolated(self):
+        """Global verbosity is isolated from commands run in scripts.
+        """
+        # see also 656694; we should get rid of global verbosity
+        self.run_script("""
+        $ bzr init --quiet a
+        """)
+        self.assertEquals(trace.is_quiet(), False)
+
 
 class TestCat(script.TestCaseWithTransportAndScript):