← 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-07-01 22:52:11 UTC
  • mfrom: (6005.1.1 784505-test_exe_on_path)
  • Revision ID: pqm@pqm.ubuntu.com-20110701225211-q0k5frf3by2214lb
(mbp) Fixes bug 785404 by using known executables for win32 (cmd.exe) and
 other platforms (sh) in test_exe_on_path. (Gordon Tyler)

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'))