[MERGE] fix up test_bench_history more

[Robert Collins]

On Wed, 2006-08-23 at 14:19 +1000, Andrew Bennetts wrote:
> Aaron Bentley wrote:
> [...]
> > > Only problem I see is that it won't work on an installed bzr.
> > > So if we can check for that (say by catching NotBranchError, and just
> > > raising TestSkipped).
> > > 
> > > +1 either way. And seems trivial enough for 0.10.
> > 
> > Thanks.  Merged, with the suggested skip.
> 
> Actually, I bumped into a further problem -- if the format of the bzr branch
> isn't recognised, then this still breaks.  Also, Martin pointed out to me that
> there's a _get_bzr_source_tree function that already either finds the
> workingtree or returns None, so rather than reinventing it ad hoc I've updated
> the test to use it.  I also had to relax the regex assertion because if there is
> no workingtree, then there's no revision, so the output we're compariing will
> look a bit different.  The regex issue also affected
> test_assigned_benchmark_file_stores_date.
> 
> I've attached a bundle with these changes.

+1 from me, ok for 0.10.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060823/8ad92100/attachment.pgp