← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:11:25 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-20051201171125-5e1f0970246c4925
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
39
39
from bzrlib.branch import Branch
40
40
from bzrlib.clone import copy_branch
41
41
from bzrlib.errors import BzrCommandError
42
 
from bzrlib.osutils import has_symlinks
 
42
from bzrlib.osutils import has_symlinks, pathjoin
43
43
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
44
44
from bzrlib.tests.blackbox import ExternalBase
45
45
 
994
994
        runbzr('init')
995
995
 
996
996
        self.assertEquals(capture('root').rstrip(),
997
 
                          os.path.join(self.test_dir, 'branch1'))
 
997
                          pathjoin(self.test_dir, 'branch1'))
998
998
 
999
999
        progress("status of new file")
1000
1000
 
1070
1070
        runbzr("rename sub1 sub2")
1071
1071
        runbzr("move hello.txt sub2")
1072
1072
        self.assertEqual(capture("relpath sub2/hello.txt"),
1073
 
                         os.path.join("sub2", "hello.txt\n"))
 
1073
                         pathjoin("sub2", "hello.txt\n"))
1074
1074
 
1075
1075
        self.assert_(exists("sub2"))
1076
1076
        self.assert_(exists("sub2/hello.txt"))
1092
1092
 
1093
1093
        chdir('sub1/sub2')
1094
1094
        self.assertEquals(capture('root')[:-1],
1095
 
                          os.path.join(self.test_dir, 'branch1'))
 
1095
                          pathjoin(self.test_dir, 'branch1'))
1096
1096
        runbzr('move ../hello.txt .')
1097
1097
        self.assert_(exists('./hello.txt'))
1098
1098
        self.assertEquals(capture('relpath hello.txt'),
1099
 
                          os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
1100
 
        self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
 
1099
                          pathjoin('sub1', 'sub2', 'hello.txt') + '\n')
 
1100
        self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), pathjoin('sub1', 'sub2', 'hello.txt\n'))
1101
1101
        runbzr(['commit', '-m', 'move to parent directory'])
1102
1102
        chdir('..')
1103
 
        self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
 
1103
        self.assertEquals(capture('relpath sub2/hello.txt'), pathjoin('sub1', 'sub2', 'hello.txt\n'))
1104
1104
 
1105
1105
        runbzr('move sub2/hello.txt .')
1106
1106
        self.assert_(exists('hello.txt'))