← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
434
434
        # Merging a branch pulls its revision into the tree
435
435
        a = Branch.open('.')
436
436
        b = Branch.open('../b')
437
 
        a.storage.get_revision_xml(b.last_revision())
 
437
        a.repository.get_revision_xml(b.last_revision())
438
438
        self.log('pending merges: %s', a.working_tree().pending_merges())
439
439
        self.assertEquals(a.working_tree().pending_merges(),
440
440
                          [b.last_revision()])
883
883
            from bzrlib.testament import Testament
884
884
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
885
885
            self.runbzr('re-sign -r revid:A')
886
 
            self.assertEqual(Testament.from_revision(branch.storage,
 
886
            self.assertEqual(Testament.from_revision(branch.repository,
887
887
                             'A').as_short_text(),
888
 
                             branch.storage.revision_store.get('A', 
 
888
                             branch.repository.revision_store.get('A', 
889
889
                             'sig').read())
890
890
        finally:
891
891
            bzrlib.gpg.GPGStrategy = oldstrategy
903
903
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
904
904
            self.runbzr('re-sign -r 1..')
905
905
            self.assertEqual(
906
 
                Testament.from_revision(branch.storage,'A').as_short_text(),
907
 
                branch.storage.revision_store.get('A', 'sig').read())
 
906
                Testament.from_revision(branch.repository,'A').as_short_text(),
 
907
                branch.repository.revision_store.get('A', 'sig').read())
908
908
            self.assertEqual(
909
 
                Testament.from_revision(branch.storage,'B').as_short_text(),
910
 
                branch.storage.revision_store.get('B', 'sig').read())
911
 
            self.assertEqual(Testament.from_revision(branch.storage,
 
909
                Testament.from_revision(branch.repository,'B').as_short_text(),
 
910
                branch.repository.revision_store.get('B', 'sig').read())
 
911
            self.assertEqual(Testament.from_revision(branch.repository,
912
912
                             'C').as_short_text(),
913
 
                             branch.storage.revision_store.get('C', 
 
913
                             branch.repository.revision_store.get('C', 
914
914
                             'sig').read())
915
915
        finally:
916
916
            bzrlib.gpg.GPGStrategy = oldstrategy