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

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/progress into lp:bzr.
> 
> Requested reviews:
>   bzr-core (bzr-core)
> Related bugs:
>   #388266 many uses of DummyProgress are unnecessary
>   https://bugs.launchpad.net/bugs/388266
> 
> 
> * Truncate the description rather than the counter, so that you don't get misleading numbers.
> 
> * Put the spinner (or bar) between the transport activity and the current progress task, so we don't have two '|' on the line, one of them apparently stuck.
> 

Failing in PQM with:

> ======================================================================
> FAIL: bzrlib.tests.test_ui.TestTextUIFactory.test_progress_note_clears
> ----------------------------------------------------------------------
> _StringException: Text attachment: log
> ------------
> 4446.457  Deprecated method called
> Called from:
>   File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_ui.py", line 138, in test_progress_n
> ote_clears
>     pb.note, 't')
>   File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/__init__.py", line 1389, in applyDeprecat
> ed
>     call_warnings, result = self._capture_deprecation_warnings(a_callable,
>   File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/__init__.py", line 1357, in _capture_depr
> ecation_warnings
>     result = a_callable(*args, **kwargs)
>   File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/symbol_versioning.py", line 132, in decorated_m
> ethod
>     trace.mutter_callsite(4, "Deprecated method called")
> ------------
> Text attachment: traceback
> ------------
> Traceback (most recent call last):
>   File "/usr/lib/python2.4/site-packages/testtools/runtest.py", line 128, in _run_user
>     return fn(*args)
>   File "/usr/lib/python2.4/site-packages/testtools/testcase.py", line 368, in _run_test_method
>     testMethod()
>   File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_ui.py", line 144, in test_progress_n
> ote_clears
>     self.assertContainsRe(stderr.getvalue(), r'\r {10,}\r$')
> AssertionError: pattern "\r {10,}\r$" not found in
> """\
> """ 1/1
> 
> ------------
> 
> 
> ======================================================================
> FAIL: bzrlib.tests.test_ui.TestTextUIFactory.test_text_factory_prompts_and_clears
> ----------------------------------------------------------------------
> _StringException: Text attachment: log
> ------------
> 
> ------------
> Text attachment: traceback
> ------------
> Traceback (most recent call last):
>   File "/usr/lib/python2.4/site-packages/testtools/runtest.py", line 128, in _run_user
>     return fn(*args)
>   File "/usr/lib/python2.4/site-packages/testtools/testcase.py", line 368, in _run_test_method
>     testMethod()
>   File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_ui.py", line 208, in test_text_facto
> ry_prompts_and_clears
>     "foo *\r\r  *\r*")
> *" not found in pattern "foo *
> """\
> what do you want? [y/n]: what do you want? [y/n]: """
> 
> ------------
> 
> 
> ----------------------------------------------------------------------
> Ran 45 tests in 6.348s
> 
> FAILED (failures=2)


John
=:->

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

iEYEARECAAYFAkw3s5EACgkQJdeBCYSNAANI2gCfbsVqlS8GFgsv0AFYKPIRp/xv
QicAoNgR80p3ZQj58r8la9onKojyaoDq
=siWp
-----END PGP SIGNATURE-----