Rev 3608: Fix test failure on PQM. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 3608
revision-id: robertc at robertcollins.net-20080923012306-iucxo8t4l7lhry5y
parent: robertc at robertcollins.net-20080922232126-liu0qmrb1lacom17
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2008-09-23 11:23:06 +1000
message:
  Fix test failure on PQM.
modified:
  bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- a/bzrlib/tests/blackbox/test_annotate.py	2008-09-02 01:26:52 +0000
+++ b/bzrlib/tests/blackbox/test_annotate.py	2008-09-23 01:23:06 +0000
@@ -26,6 +26,8 @@
 
 import os
 
+from bzrlib.branch import Branch
+from bzrlib.config import extract_email_address
 from bzrlib.tests import TestCaseWithTransport
 
 
@@ -199,12 +201,13 @@
     def test_annotated_edited_merged_file_revnos(self):
         self._create_merged_file()
         out, err = self.run_bzr('annotate file')
+        email = extract_email_address(Branch.open('.').get_config().username())
         self.assertEqual(
-            '3?    robertc | local\n'
+            '3?    %-7s | local\n'
             '1     test at ho | foo\n'
             '1.1.1 test at ho | bar\n'
             '2     test at ho | baz\n'
-            '1     test at ho | gam\n',
+            '1     test at ho | gam\n' % email[:7],
             out)
 
     def test_annotated_edited_merged_file_ids(self):