/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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 19:15:58 UTC
  • mfrom: (6388 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6404.
  • Revision ID: jelmer@canonical.com-20111219191558-p1k7cvhjq8l6v2gm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
920
920
            revision = _mod_revision.Revision('rev1a',
921
921
                committer='jrandom@example.com', timestamp=0,
922
922
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
923
 
            repo.add_revision('rev1a',revision, inv)
 
923
            repo.add_revision('rev1a', revision, inv)
924
924
 
925
925
            # make rev1b, which has no Revision, but has an Inventory, and
926
926
            # file1
961
961
        revision = _mod_revision.Revision(revision_id,
962
962
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
963
963
            timezone=0, message='foo', parent_ids=parent_ids)
964
 
        repo.add_revision(revision_id,revision, inv)
 
964
        repo.add_revision(revision_id, revision, inv)
965
965
 
966
966
    def add_file(self, repo, inv, filename, revision, parents):
967
967
        file_id = filename + '-id'
1097
1097
            sorted(set([osutils.splitext(n)[0] for n in
1098
1098
                        packs._index_transport.list_dir('.')])))
1099
1099
 
 
1100
    def test__obsolete_packs_missing_directory(self):
 
1101
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1102
        r.control_transport.rmdir('obsolete_packs')
 
1103
        names = packs.names()
 
1104
        pack = packs.get_pack_by_name(names[0])
 
1105
        # Schedule this one for removal
 
1106
        packs._remove_pack_from_memory(pack)
 
1107
        # Now trigger the obsoletion, and ensure that all the remaining files
 
1108
        # are still renamed
 
1109
        packs._obsolete_packs([pack])
 
1110
        self.assertEqual([n + '.pack' for n in names[1:]],
 
1111
                         sorted(packs._pack_transport.list_dir('.')))
 
1112
        # names[0] should not be present in the index anymore
 
1113
        self.assertEqual(names[1:],
 
1114
            sorted(set([osutils.splitext(n)[0] for n in
 
1115
                        packs._index_transport.list_dir('.')])))
 
1116
 
1100
1117
    def test_pack_distribution_zero(self):
1101
1118
        packs = self.get_packs()
1102
1119
        self.assertEqual([0], packs.pack_distribution(0))
1372
1389
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1373
1390
        self.assertEqual([pack.name], sorted(obsolete_names))
1374
1391
 
 
1392
    def test_pack_no_obsolete_packs_directory(self):
 
1393
        """Bug #314314, don't fail if obsolete_packs directory does
 
1394
        not exist."""
 
1395
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1396
        r.control_transport.rmdir('obsolete_packs')
 
1397
        packs._clear_obsolete_packs()
1375
1398
 
1376
1399
 
1377
1400
class TestPack(TestCaseWithTransport):