/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_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-08 17:51:43 UTC
  • mfrom: (5684.2.5 per-repository-vf)
  • mto: This revision was merged to the branch mainline in revision 5710.
  • Revision ID: jelmer@samba.org-20110308175143-949n8c8lodfb4tvc
Merge per-repository-vf, move scenarios to test_check_reconcile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
 
import os
19
 
 
20
18
from bzrlib import (
21
19
    bzrdir,
22
20
    conflicts,
299
297
        self.assertEqual([], tree.get_parent_ids())
300
298
 
301
299
 
302
 
class TestFormat2WorkingTree(TestCaseWithTransport):
303
 
    """Tests that are specific to format 2 trees."""
304
 
 
305
 
    def create_format2_tree(self, url):
306
 
        return self.make_branch_and_tree(
307
 
            url, format=bzrdir.BzrDirFormat6())
308
 
 
309
 
    def test_conflicts(self):
310
 
        # test backwards compatability
311
 
        tree = self.create_format2_tree('.')
312
 
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
313
 
                          None)
314
 
        file('lala.BASE', 'wb').write('labase')
315
 
        expected = conflicts.ContentsConflict('lala')
316
 
        self.assertEqual(list(tree.conflicts()), [expected])
317
 
        file('lala', 'wb').write('la')
318
 
        tree.add('lala', 'lala-id')
319
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
320
 
        self.assertEqual(list(tree.conflicts()), [expected])
321
 
        file('lala.THIS', 'wb').write('lathis')
322
 
        file('lala.OTHER', 'wb').write('laother')
323
 
        # When "text conflict"s happen, stem, THIS and OTHER are text
324
 
        expected = conflicts.TextConflict('lala', file_id='lala-id')
325
 
        self.assertEqual(list(tree.conflicts()), [expected])
326
 
        os.unlink('lala.OTHER')
327
 
        os.mkdir('lala.OTHER')
328
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
329
 
        self.assertEqual(list(tree.conflicts()), [expected])
330
 
 
331
 
 
332
300
class InstrumentedTree(object):
333
301
    """A instrumented tree to check the needs_tree_write_lock decorator."""
334
302