~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

transport implementations now tested consistently.

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
        branch = Branch.initialize(u'.')
65
65
        wt, relpath = WorkingTree.open_containing()
66
66
        self.assertEqual('', relpath)
67
 
        self.assertEqual(wt.basedir, branch.base)
 
67
        self.assertEqual(wt.basedir + '/', branch.base)
68
68
        wt, relpath = WorkingTree.open_containing(u'.')
69
69
        self.assertEqual('', relpath)
70
 
        self.assertEqual(wt.basedir, branch.base)
 
70
        self.assertEqual(wt.basedir + '/', branch.base)
71
71
        wt, relpath = WorkingTree.open_containing('./foo')
72
72
        self.assertEqual('foo', relpath)
73
 
        self.assertEqual(wt.basedir, branch.base)
 
73
        self.assertEqual(wt.basedir + '/', branch.base)
74
74
        # paths that are urls are just plain wrong for working trees.
75
75
        self.assertRaises(NotBranchError,
76
76
                          WorkingTree.open_containing, 
80
80
        branch = Branch.initialize(u'.')
81
81
        tree = WorkingTree(branch.base, branch)
82
82
        self.assertEqual(branch, tree.branch)
83
 
        self.assertEqual(branch.base, tree.basedir)
 
83
        self.assertEqual(branch.base, tree.basedir + '/')
84
84
    
85
85
    def test_construct_without_branch(self):
86
86
        branch = Branch.initialize(u'.')
87
87
        tree = WorkingTree(branch.base)
88
88
        self.assertEqual(branch.base, tree.branch.base)
89
 
        self.assertEqual(branch.base, tree.basedir)
 
89
        self.assertEqual(branch.base, tree.basedir + '/')
90
90
 
91
91
    def test_basic_relpath(self):
92
92
        # for comprehensive relpath tests, see whitebox.py.