← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remerge.py

  • Committer: Jelmer Vernooij
  • Date: 2009-06-09 00:59:51 UTC
  • mto: (4443.1.1 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 4444.
  • Revision ID: jelmer@samba.org-20090609005951-apv900cdk35o2ygh
Move squashing of XML-invalid characters to XMLSerializer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
 
18
18
import os
19
19
 
20
 
from bzrlib.tests import TestCaseWithTransport
 
20
from bzrlib.tests.blackbox import ExternalBase
21
21
from bzrlib.workingtree import WorkingTree
22
22
 
23
23
 
24
 
class TestRemerge(TestCaseWithTransport):
 
24
class TestRemerge(ExternalBase):
25
25
 
26
26
    def make_file(self, name, contents):
27
27
        f = open(name, 'wb')
74
74
                           'remerge hello --merge-type weave',
75
75
                           retcode=1)
76
76
 
77
 
        self.assertPathExists('hello.OTHER')
78
 
        self.assertPathDoesNotExist('question.OTHER')
 
77
        self.failUnlessExists('hello.OTHER')
 
78
        self.failIfExists('question.OTHER')
79
79
 
80
80
        file_id = self.run_bzr('file-id hello')[0]
81
81
        self.run_bzr_error(['hello.THIS is not versioned'],
84
84
        self.run_bzr_error(['conflicts encountered'],
85
85
                           'remerge --merge-type weave', retcode=1)
86
86
 
87
 
        self.assertPathExists('hello.OTHER')
88
 
        self.assertTrue('hello.BASE')
 
87
        self.failUnlessExists('hello.OTHER')
 
88
        self.failIfExists('hello.BASE')
89
89
        self.assertFalse('|||||||' in conflict_text)
90
90
        self.assertFalse('hi world' in conflict_text)
91
91