[MERGE] Make the test suite pass when -Eallow_debug is used.

[Vincent Ladeuil]

>>>>> "Andrew" == Andrew Bennetts <andrew at canonical.com> writes:

    Andrew> This is a nearly trivial change.  With it “bzr selftest -Eallow_debug”
    Andrew> passes.

Huh ?

Banging head on wall.

...

Looking at annotate

...

Banging again.

Damn it, I didn't see that one lands and can't remember how often
I pestered about the inability to use -Dhttp while running some
tests :-(

    Andrew> It's confusing to have unrelated failures appear when
    Andrew> you turn debugging options on :)

But... where are the tests ? :D

BB:tweak

       Vincent