← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:25:16 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201172516-5232226cd9ec1f0e
A couple more path.join statements needed changing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_whitebox.py
4
4
from bzrlib.tests import TestCaseInTempDir, TestCase
5
5
from bzrlib.branch import ScratchBranch, Branch
6
6
from bzrlib.errors import NotBranchError
 
7
from bzrlib.osutils import pathjoin
7
8
 
8
9
 
9
10
class TestBranch(TestCaseInTempDir):
89
90
        
90
91
        try:
91
92
            # check paths inside dtmp while standing outside it
92
 
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
 
93
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
93
94
 
94
95
            # root = nothing
95
96
            self.assertEqual(rp(dtmp), '')
112
113
            # directory, or nearby
113
114
            os.chdir(dtmp)
114
115
 
115
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
116
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
116
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
117
117
 
118
118
            self.assertEqual(rp('foo'), 'foo')
119
119