← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_pack_repository.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_pack_repository.py
262
262
        self.addCleanup(tree.unlock)
263
263
        pack = tree.branch.repository._pack_collection.get_pack_by_name(
264
264
            tree.branch.repository._pack_collection.names()[0])
265
 
        # revision access tends to be tip->ancestor, so ordering that way on 
 
265
        # revision access tends to be tip->ancestor, so ordering that way on
266
266
        # disk is a good idea.
267
267
        for _1, key, val, refs in pack.revision_index.iter_all_entries():
268
268
            if key == ('1',):
601
601
        self.assertContainsRe(log_file, r'INFO  bzr: ERROR \(ignored\):')
602
602
        if token is not None:
603
603
            repo.leave_lock_in_place()
604
 
        
 
604
 
605
605
    def test_abort_write_group_does_raise_when_not_suppressed(self):
606
606
        self.vfs_transport_factory = memory.MemoryServer
607
607
        repo = self.make_repository('repo')
679
679
 
680
680
    def setUp(self):
681
681
        if not self.format_supports_external_lookups:
682
 
            raise TestNotApplicable("%r doesn't support stacking" 
 
682
            raise TestNotApplicable("%r doesn't support stacking"
683
683
                % (self.format_name,))
684
684
        super(TestPackRepositoryStacking, self).setUp()
685
685