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

Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
336
336
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
337
337
        self.check_knits(t)
338
338
 
339
 
 
340
339
class InterString(repository.InterRepository):
341
340
    """An inter-repository optimised code path for strings.
342
341
 
454
453
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;') 
455
454
 
456
455
 
457
 
class TestRepositoryFormatKnit2(TestCaseWithTransport):
 
456
class TestRepositoryFormatKnit3(TestCaseWithTransport):
458
457
 
459
458
    def test_convert(self):
460
459
        """Ensure the upgrade adds weaves for roots"""
466
465
        self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
467
466
            revision_tree.inventory.root.file_id)
468
467
        format = bzrdir.BzrDirMetaFormat1()
469
 
        format.repository_format = knitrepo.RepositoryFormatKnit2()
 
468
        format.repository_format = knitrepo.RepositoryFormatKnit3()
470
469
        upgrade.Convert('.', format)
471
470
        tree = workingtree.WorkingTree.open('.')
472
471
        revision_tree = tree.branch.repository.revision_tree('dull')
474
473
        tree.commit("Another dull commit", rev_id='dull2')
475
474
        revision_tree = tree.branch.repository.revision_tree('dull2')
476
475
        self.assertEqual('dull', revision_tree.inventory.root.revision)
 
476