/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 bzrlib/tests/test_multiparent.py

  • Committer: Gordon Tyler
  • Date: 2011-09-09 12:42:32 UTC
  • mto: (6015.33.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: gordon@doxxx.net-20110909124232-ip0bgx4tx6y5fya6
https://launchpad.net/bugs/828803
Use get_user_option in get_merge_tools so that quoted values are correctly unquoted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_multiparent.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
from unittest import TestCase
18
18
 
19
19
from bzrlib import (
20
 
    knit,
21
20
    multiparent,
22
21
    patiencediff,
23
22
    tests,
266
265
    def test_filenames(self):
267
266
        vf = multiparent.MultiVersionedFile('foop')
268
267
        vf.add_version('a\nb\nc\nd'.splitlines(True), 'a', [])
269
 
        self.failUnlessExists('foop.mpknit')
270
 
        self.failIfExists('foop.mpidx')
 
268
        self.assertPathExists('foop.mpknit')
 
269
        self.assertPathDoesNotExist('foop.mpidx')
271
270
        vf.save()
272
 
        self.failUnlessExists('foop.mpidx')
 
271
        self.assertPathExists('foop.mpidx')
273
272
        vf.destroy()
274
 
        self.failIfExists('foop.mpknit')
275
 
        self.failIfExists('foop.mpidx')
 
273
        self.assertPathDoesNotExist('foop.mpknit')
 
274
        self.assertPathDoesNotExist('foop.mpidx')