← 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: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

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.failUnlessExists(tmpfile)
 
74
        self.assertPathExists(tmpfile)
75
75
        os.remove(tmpfile)
76
76
 
77
77
 
135
135
        def dummy_invoker(exe, args, cleanup):
136
136
            self._exe = exe
137
137
            self._args = args
138
 
            self.failUnlessExists(args[0])
 
138
            self.assertPathExists(args[0])
139
139
            f = open(args[0], 'wt')
140
140
            f.write('temp stuff')
141
141
            f.close()
145
145
                                    dummy_invoker)
146
146
        self.assertEqual(0, retcode)
147
147
        self.assertEqual('tool', self._exe)
148
 
        self.failIfExists(self._args[0])
 
148
        self.assertPathDoesNotExist(self._args[0])
149
149
        self.assertFileEqual('temp stuff', 'test.txt')
150
150
    
151
151
    def test_failure_tempfile(self):
152
152
        def dummy_invoker(exe, args, cleanup):
153
153
            self._exe = exe
154
154
            self._args = args
155
 
            self.failUnlessExists(args[0])
 
155
            self.assertPathExists(args[0])
156
156
            self.log(repr(args))
157
157
            f = open(args[0], 'wt')
158
158
            self.log(repr(f))