Rev 5401: Use overrideAttr() to ensure correct handling on failures. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/mergetools/

------------------------------------------------------------
revno: 5401
revision-id: v.ladeuil+lp at free.fr-20101125081116-hl8h2dvrp36qpvmc
parent: v.ladeuil+lp at free.fr-20101124165634-7j4hqvtoe3t0qqp9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Thu 2010-11-25 09:11:16 +0100
message:
  Use overrideAttr() to ensure correct handling on failures.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_mergetools.py'
--- a/bzrlib/tests/test_mergetools.py	2010-11-24 16:56:34 +0000
+++ b/bzrlib/tests/test_mergetools.py	2010-11-25 08:11:16 +0000
@@ -314,10 +314,8 @@
     def test_detect(self):
         # only way to reliably test detection is to add a known existing
         # executable to the list used for detection
-        old_kmt = mergetools._KNOWN_MERGE_TOOLS
-        mergetools._KNOWN_MERGE_TOOLS = ['sh', 'cmd']
+        self.overrideAttr(mergetools, '_KNOWN_MERGE_TOOLS', ['sh', 'cmd'])
         tools = mergetools.detect_merge_tools()
         tools_commandlines = [mt.get_commandline() for mt in tools]
         self.assertTrue('sh' in tools_commandlines or
                         'cmd' in tools_commandlines)
-        mergetools._KNOWN_MERGE_TOOLS = old_kmt