← 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-05-18 10:55:12 UTC
  • mfrom: (5887.1.1 trivial_close_earlier)
  • Revision ID: pqm@pqm.ubuntu.com-20110518105512-8rhaqw4g6a8pnjuo
(jameinel) Close file objects a bit earlier in _seek_and_read. Helps PyPy's
 lazy collector. (Martin [gz])

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
 
        if sys.platform == 'win32':
85
 
            exe = 'cmd.exe'
86
 
        else:
87
 
            exe = 'sh'
88
 
        self.assertTrue(mergetools.check_availability(exe))
 
84
        self.assertTrue(mergetools.check_availability(
 
85
            os.path.basename(sys.executable)))
89
86
 
90
87
    def test_nonexistent(self):
91
88
        self.assertFalse(mergetools.check_availability('DOES NOT EXIST'))