← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2014-04-09 08:05:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6593.
  • Revision ID: v.ladeuil+lp@free.fr-20140409080523-kb5kr12j29imskd0
https://launchpad.net/bugs/1303879
Late bugfix in python 2.7.6, only tests are affected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
943
943
                         osutils._win32_pathjoin('path/to', 'C:/foo'))
944
944
        self.assertEqual('path/to/foo',
945
945
                         osutils._win32_pathjoin('path/to/', 'foo'))
946
 
        self.assertEqual('/foo',
 
946
 
 
947
    def test_pathjoin_late_bugfix(self):
 
948
        if sys.version_info < (2, 7, 6):
 
949
            expected = '/foo'
 
950
        else:
 
951
            expected = 'C:/foo'
 
952
        self.assertEqual(expected,
947
953
                         osutils._win32_pathjoin('C:/path/to/', '/foo'))
948
 
        self.assertEqual('/foo',
 
954
        self.assertEqual(expected,
949
955
                         osutils._win32_pathjoin('C:\\path\\to\\', '\\foo'))
950
956
 
951
957
    def test_normpath(self):