← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Martin Pool
  • Date: 2006-11-02 10:20:19 UTC
  • mfrom: (2114 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2119.
  • Revision ID: mbp@sourcefrog.net-20061102102019-9a5a02f485dff6f6
merge bzr.dev and reconcile several changes, also some test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
173
173
        t = control.get_workingtree_transport(None)
174
174
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
175
175
                             t.get('format').read())
176
 
        self.assertEqualDiff('<inventory format="5">\n'
177
 
                             '</inventory>\n',
178
 
                             t.get('inventory').read())
 
176
        # self.assertContainsRe(t.get('inventory').read(), 
 
177
        #                       '<inventory file_id="[^"]*" format="5">\n'
 
178
        #                       '</inventory>\n',
 
179
        #                      )
 
180
        # WorkingTreeFormat3 doesn't default to creating a unique root id,
 
181
        # because it is incompatible with older bzr versions
 
182
        self.assertContainsRe(t.get('inventory').read(),
 
183
                              '<inventory format="5">\n'
 
184
                              '</inventory>\n',
 
185
                             )
179
186
        self.assertEqualDiff('### bzr hashcache v5\n',
180
187
                             t.get('stat-cache').read())
181
188
        self.assertFalse(t.has('inventory.basis'))