← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mergetools.py

Merge pt1 hooks branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mergetools.py
71
71
                         'test.txt.OTHER'))
72
72
        cmd_list = ['some_tool', '{this_temp}']
73
73
        args, tmpfile = mergetools._subst_filename(cmd_list, 'test.txt')
74
 
        self.assertPathExists(tmpfile)
 
74
        self.failUnlessExists(tmpfile)
75
75
        os.remove(tmpfile)
76
76
 
77
77
 
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'))
138
135
        def dummy_invoker(exe, args, cleanup):
139
136
            self._exe = exe
140
137
            self._args = args
141
 
            self.assertPathExists(args[0])
 
138
            self.failUnlessExists(args[0])
142
139
            f = open(args[0], 'wt')
143
140
            f.write('temp stuff')
144
141
            f.close()
148
145
                                    dummy_invoker)
149
146
        self.assertEqual(0, retcode)
150
147
        self.assertEqual('tool', self._exe)
151
 
        self.assertPathDoesNotExist(self._args[0])
 
148
        self.failIfExists(self._args[0])
152
149
        self.assertFileEqual('temp stuff', 'test.txt')
153
150
    
154
151
    def test_failure_tempfile(self):
155
152
        def dummy_invoker(exe, args, cleanup):
156
153
            self._exe = exe
157
154
            self._args = args
158
 
            self.assertPathExists(args[0])
 
155
            self.failUnlessExists(args[0])
159
156
            self.log(repr(args))
160
157
            f = open(args[0], 'wt')
161
158
            self.log(repr(f))