Rev 5576: Meg, that's the doctest we want to comment. in file:///home/vila/src/bzr/bugs/690563-test-isolation/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5576
revision-id: v.ladeuil+lp at free.fr-20101216143957-6b7n7c4j3smj1nhb
parent: v.ladeuil+lp at free.fr-20101216090242-uo50007syhg02lpq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-test-isolation
timestamp: Thu 2010-12-16 15:39:57 +0100
message:
  Meg, that's the doctest we want to comment.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-12-16 09:02:42 +0000
+++ b/bzrlib/tests/__init__.py	2010-12-16 14:39:57 +0000
@@ -3677,13 +3677,7 @@
         'bzrlib.tests.test_bad_files',
         'bzrlib.tests.test_bisect_multi',
         'bzrlib.tests.test_branch',
-        # 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.tests.test_branchbuilder',
+        'bzrlib.tests.test_branchbuilder',
         'bzrlib.tests.test_btree_index',
         'bzrlib.tests.test_bugtracker',
         'bzrlib.tests.test_bundle',
@@ -3848,7 +3842,13 @@
         return []
     return [
         'bzrlib',
-        'bzrlib.branchbuilder',
+        # 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.decorators',
         'bzrlib.export',
         'bzrlib.inventory',