/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
156
156
            format.initialize(dir)
157
157
            t = transport.get_transport(url)
158
158
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
159
 
            self.failUnless(isinstance(found_format, format.__class__))
 
159
            self.assertIsInstance(found_format, format.__class__)
160
160
        check_format(workingtree.WorkingTreeFormat3(), "bar")
161
161
 
162
162
    def test_find_format_no_tree(self):
373
373
        self.build_tree_contents([('other/hello', 'hELLO')])
374
374
        other.commit('Case switch')
375
375
        this = base.bzrdir.sprout('this').open_workingtree()
376
 
        self.failUnlessExists('this/hello')
 
376
        self.assertPathExists('this/hello')
377
377
        self.build_tree_contents([('this/hello', 'Hello World')])
378
378
        this.commit('Add World')
379
379
        this.merge_from_branch(other.branch)
400
400
        self.assertEqual([], this.conflicts())
401
401
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
402
402
                         resolved)
403
 
        self.failIfExists('this/hello.BASE')
 
403
        self.assertPathDoesNotExist('this/hello.BASE')
404
404
 
405
405
    def test_auto_resolve_dir(self):
406
406
        tree = self.make_branch_and_tree('tree')