← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_multiparent.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-20 17:19:44 UTC
  • mfrom: (4973.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100120171944-8gkub20gotjcye67
(spiv) Implement a per-file merge hook

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_multiparent.py
1
 
# Copyright (C) 2007, 2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2007 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,
20
21
    multiparent,
21
22
    patiencediff,
22
23
    tests,
265
266
    def test_filenames(self):
266
267
        vf = multiparent.MultiVersionedFile('foop')
267
268
        vf.add_version('a\nb\nc\nd'.splitlines(True), 'a', [])
268
 
        self.assertPathExists('foop.mpknit')
269
 
        self.assertPathDoesNotExist('foop.mpidx')
 
269
        self.failUnlessExists('foop.mpknit')
 
270
        self.failIfExists('foop.mpidx')
270
271
        vf.save()
271
 
        self.assertPathExists('foop.mpidx')
 
272
        self.failUnlessExists('foop.mpidx')
272
273
        vf.destroy()
273
 
        self.assertPathDoesNotExist('foop.mpknit')
274
 
        self.assertPathDoesNotExist('foop.mpidx')
 
274
        self.failIfExists('foop.mpknit')
 
275
        self.failIfExists('foop.mpidx')