← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mergetools.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-09 17:04:46 UTC
  • mfrom: (6055.1.3 822571-bzr-home-unicode)
  • Revision ID: pqm@pqm.ubuntu.com-20110809170446-f1wc1a8fhgnxi4cn
(vila) Decode BZR_HOME with fs encoding to allow unicode homes. (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mergetools.py
81
81
        self.assertTrue(mergetools.check_availability(sys.executable))
82
82
 
83
83
    def test_exe_on_path(self):
84
 
        self.assertTrue(mergetools.check_availability(
85
 
            os.path.basename(sys.executable)))
 
84
        if sys.platform == 'win32':
 
85
            exe = 'cmd.exe'
 
86
        else:
 
87
            exe = 'sh'
 
88
        self.assertTrue(mergetools.check_availability(exe))
86
89
 
87
90
    def test_nonexistent(self):
88
91
        self.assertFalse(mergetools.check_availability('DOES NOT EXIST'))