Rev 5423: Fix failing test. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5423
revision-id: v.ladeuil+lp at free.fr-20101206100444-t3m50se27q1kzimm
parent: v.ladeuil+lp at free.fr-20101206100150-jakhpj9ud2exxplq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Mon 2010-12-06 11:04:44 +0100
message:
  Fix failing test.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2010-12-06 10:01:50 +0000
+++ b/bzrlib/tests/test_osutils.py	2010-12-06 10:04:44 +0000
@@ -2124,13 +2124,14 @@
         if sys.platform != 'win32':
             raise tests.TestSkipped('test requires win32')
         self.assertTrue(osutils.find_executable_on_path('explorer') is not None)
-        self.assertTrue(osutils.find_executable_on_path('explorer.exe') is not None)
+        self.assertTrue(osutils.find_executable_on_path('explorer.exe')
+                        is not None)
         self.assertTrue(
             osutils.find_executable_on_path('THIS SHOULD NOT EXIST') is None)
 
     def test_other(self):
         if sys.platform == 'win32':
             raise tests.TestSkipped('test requires non-win32')
-        self.assertTrue(osutils.is_executable_on_path('sh') is not None)
+        self.assertTrue(osutils.find_executable_on_path('sh') is not None)
         self.assertTrue(
-            osutils.is_executable_on_path('THIS SHOULD NOT EXIST') is None)
+            osutils.find_executable_on_path('THIS SHOULD NOT EXIST') is None)