← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
136
136
 
137
137
    def setUp(self):
138
138
        super(TestEntryDiffing, self).setUp()
139
 
        self.branch = Branch.initialize('.')
 
139
        self.branch = Branch.initialize(u'.')
140
140
        self.wt = self.branch.working_tree()
141
141
        print >> open('file', 'wb'), 'foo'
142
142
        self.branch.working_tree().add(['file'], ['fileid'])
239
239
        # to change, and then test merge patterns
240
240
        # with fake parent entries.
241
241
        super(TestSnapshot, self).setUp()
242
 
        self.branch = Branch.initialize('.')
 
242
        self.branch = Branch.initialize(u'.')
243
243
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
244
244
        self.branch.working_tree().add(['subdir', 'subdir/file'],
245
245
                                       ['dirid', 'fileid'])
328
328
        #   a descendent of the other. (B, D)
329
329
        super(TestPreviousHeads, self).setUp()
330
330
        self.build_tree(['file'])
331
 
        self.branch = Branch.initialize('.')
 
331
        self.branch = Branch.initialize(u'.')
332
332
        self.wt = self.branch.working_tree()
333
333
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
334
334
        self.inv_A = self.branch.storage.get_inventory('A')