Rev 5576: Preliminary fix for bug #321320 in file:///home/vila/src/bzr/bugs/test-isolation/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/test-isolation/

------------------------------------------------------------
revno: 5576 [merge]
revision-id: v.ladeuil+lp at free.fr-20101217143057-1jzbj1icd6rbbiyw
parent: v.ladeuil+lp at free.fr-20101217142944-bqdeohokfv1i2ob9
parent: v.ladeuil+lp at free.fr-20101217133233-46ke4psbuak4vkcj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 321320-isolate-doc-tests
timestamp: Fri 2010-12-17 15:30:57 +0100
message:
  Preliminary fix for bug #321320
modified:
  bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/branchbuilder.py'
--- a/bzrlib/branchbuilder.py	2010-11-18 08:13:01 +0000
+++ b/bzrlib/branchbuilder.py	2010-12-17 13:32:33 +0000
@@ -42,10 +42,12 @@
     >>> builder.start_series()
     >>> builder.build_snapshot('rev-id', None, [
     ...     ('add', ('', 'root-id', 'directory', '')),
-    ...     ('add', ('filename', 'f-id', 'file', 'content\n'))])
+    ...     ('add', ('filename', 'f-id', 'file', 'content\n'))],
+    ...     committer='Joe <Joe at example.com>')
     'rev-id'
     >>> builder.build_snapshot('rev2-id', ['rev-id'],
-    ...     [('modify', ('f-id', 'new-content\n'))])
+    ...     [('modify', ('f-id', 'new-content\n'))],
+    ...     committer='Joe <joe at example.com>')
     'rev2-id'
     >>> builder.finish_series()
     >>> branch = builder.get_branch()

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-12-16 17:45:14 +0000
+++ b/bzrlib/tests/__init__.py	2010-12-17 14:30:57 +0000
@@ -3851,13 +3851,7 @@
         return []
     return [
         'bzrlib',
-        # FIXME: Fixing bug #690563 revealed an isolation problem in the single
-        # doctest for branchbuilder. Uncomment this when bug #321320 is fixed
-        # to ensure the issue is addressed (note that to reproduce the bug in
-        # the doctest below, one should comment the 'email' config var in
-        # bazaar.conf (or anywhere else). This means an setup where *no* user
-        # is being set at all in the environment.
-#       'bzrlib.branchbuilder',
+        'bzrlib.branchbuilder',
         'bzrlib.decorators',
         'bzrlib.export',
         'bzrlib.inventory',