← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_basis_inventory.py

  • Committer: Robert Collins
  • Date: 2006-04-06 10:21:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1640.
  • Revision ID: robertc@robertcollins.net-20060406102112-d4268ed62901e6aa
Change the basis-inventory file to not have the revision-id in the file name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_basis_inventory.py
24
24
class TestBasisInventory(TestCaseWithTransport):
25
25
 
26
26
    def test_create(self):
 
27
        # TODO: jam 20051218 this probably should add more than just
 
28
        #                    a couple files to the inventory
 
29
 
27
30
        # Make sure the basis file is created by a commit
28
31
        t = self.make_branch_and_tree('.')
29
32
        b = t.branch
31
34
        t.add('a')
32
35
        t.commit('a', rev_id='r1')
33
36
 
34
 
        self.failUnlessExists('.bzr/basis-inventory.r1')
 
37
        self.failUnlessExists('.bzr/basis-inventory')
35
38
 
36
 
        basis_inv_txt = t.read_basis_inventory('r1')
37
 
        basis_inv = serializer_v5.read_inventory_from_string(basis_inv_txt)
38
 
        #self.assertEquals('r1', basis_inv.revision_id)
 
39
        basis_inv = t.basis_tree().inventory
 
40
        self.assertEquals('r1', basis_inv.revision_id)
39
41
        
40
42
        store_inv = b.repository.get_inventory('r1')
41
43
        self.assertEquals(store_inv._byid, basis_inv._byid)
44
46
        t.add('b')
45
47
        t.commit('b', rev_id='r2')
46
48
 
47
 
        self.failIfExists('.bzr/basis-inventory.r1')
48
 
        self.failUnlessExists('.bzr/basis-inventory.r2')
 
49
        self.failUnlessExists('.bzr/basis-inventory')
49
50
 
50
 
        basis_inv_txt = t.read_basis_inventory('r2')
 
51
        basis_inv_txt = t.read_basis_inventory()
51
52
        basis_inv = serializer_v5.read_inventory_from_string(basis_inv_txt)
 
53
        self.assertEquals('r2', basis_inv.revision_id)
52
54
        store_inv = b.repository.get_inventory('r2')
53
55
 
54
56
        self.assertEquals(store_inv._byid, basis_inv._byid)