← 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-01-12 06:37:23 UTC
  • mfrom: (1534.1.6 integration)
  • Revision ID: mbp@sourcefrog.net-20060112063723-4ec91b5ff30f0830
[merge] robertc-integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
67
67
        branch = Branch.initialize(u'.')
68
68
        wt, relpath = WorkingTree.open_containing()
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(u'.')
72
72
        self.assertEqual('', relpath)
73
 
        self.assertEqual(wt.basedir, branch.base)
 
73
        self.assertEqual(wt.basedir + '/', branch.base)
74
74
        wt, relpath = WorkingTree.open_containing('./foo')
75
75
        self.assertEqual('foo', relpath)
76
 
        self.assertEqual(wt.basedir, branch.base)
 
76
        self.assertEqual(wt.basedir + '/', branch.base)
77
77
        # paths that are urls are just plain wrong for working trees.
78
78
        self.assertRaises(NotBranchError,
79
79
                          WorkingTree.open_containing, 
83
83
        branch = Branch.initialize(u'.')
84
84
        tree = WorkingTree(branch.base, branch)
85
85
        self.assertEqual(branch, tree.branch)
86
 
        self.assertEqual(branch.base, tree.basedir)
 
86
        self.assertEqual(branch.base, tree.basedir + '/')
87
87
    
88
88
    def test_construct_without_branch(self):
89
89
        branch = Branch.initialize(u'.')
90
90
        tree = WorkingTree(branch.base)
91
91
        self.assertEqual(branch.base, tree.branch.base)
92
 
        self.assertEqual(branch.base, tree.basedir)
 
92
        self.assertEqual(branch.base, tree.basedir + '/')
93
93
 
94
94
    def test_basic_relpath(self):
95
95
        # for comprehensive relpath tests, see whitebox.py.