/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_mergetools.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-17 00:47:52 UTC
  • mfrom: (7182 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20181117004752-6ywampe5pfywlby4
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_mergetools.py
53
53
 
54
54
    def test_spaces_and_quotes(self):
55
55
        cmd_list = ['kdiff3', '{base}', '{this}', '{other}', '-o', '{result}']
56
 
        args, tmpfile = mergetools._subst_filename(cmd_list,
57
 
            'file with "space and quotes".txt')
 
56
        args, tmpfile = mergetools._subst_filename(
 
57
            cmd_list, 'file with "space and quotes".txt')
58
58
        self.assertEqual(
59
59
            ['kdiff3',
60
60
             'file with "space and quotes".txt.BASE',
105
105
 
106
106
    def test_invoke_expands_exe_path(self):
107
107
        self.overrideEnv('PATH', os.path.dirname(sys.executable))
 
108
 
108
109
        def dummy_invoker(exe, args, cleanup):
109
110
            self._exe = exe
110
111
            self._args = args