[MERGE][trivial ?] Fix --verbose leaking into blackbox tests.

[John Arbash Meinel]

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

Vincent Ladeuil wrote:
> Try:
> 
>    bzr selftest -s bb.test_missing -v --no-plugins
> 
> if fails.
> 
> Yet, PQM ensures that all test passed and do so using '-v'.
> 
> So what ?
> 
> Try:
> 
>   bzr selftest -s bb.test_m -v --no-plugins
> 
> it doesn't fail anymore 8-)
> 
> selftest use --verbose very early to decide how to report tests
> execution and then doesn't care anymore about
> option._verbosity_level.
> 
> commands.run_bzr resets _verbosity_level to 0 in a finally
> clause.
> 
> So what happens is that --verbose leaks into the first run_bzr
> call but not into the following calls, and selftest is immune to
> the reset because it has already used the right value early.
> 
> The patch below fixes commands.run_bzr.
> 
> I also fixed some typos in passing.
> 
> Also, 'timezone' was declared as a global option and then
> overridden by 'log', masking a style rule violation. I removed the
> masking declaration and fixed the global one.
> 
> I could have done the opposite but there is a comment noting that
> global options can be used by plugins.
> 
>   Vincent
> 
> 
> 

BB:approve

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

iEYEARECAAYFAkjjgx4ACgkQJdeBCYSNAAN16ACgtz6/iNLwL/+p6Pm6e5NpKH7E
aOMAnR8wib/11wDV6XiElX3+oPZzWrAX
=MAEC
-----END PGP SIGNATURE-----