[Python-checkins] python/dist/src/Lib/test test_macostools.py,1.2,1.3 test_macfs.py,1.1,1.2
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Wed, 05 Feb 2003 03:14:18 -0800
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv12602
Modified Files:
test_macostools.py test_macfs.py
Log Message:
Use os.path.realpath() in stead of abspath(), so the tests don't fail if
we have a symlink somewhere in the TESTFN path.
Index: test_macostools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_macostools.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_macostools.py 28 Jan 2003 23:54:05 -0000 1.2
--- test_macostools.py 5 Feb 2003 11:14:15 -0000 1.3
***************
*** 69,73 ****
macostools.mkalias(test_support.TESTFN, TESTFN2)
fss, _, _ = macfs.ResolveAliasFile(TESTFN2)
! self.assertEqual(fss.as_pathname(), os.path.abspath(test_support.TESTFN))
def test_mkalias_relative(self):
--- 69,73 ----
macostools.mkalias(test_support.TESTFN, TESTFN2)
fss, _, _ = macfs.ResolveAliasFile(TESTFN2)
! self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
def test_mkalias_relative(self):
***************
*** 78,82 ****
macostools.mkalias(test_support.TESTFN, TESTFN2, sys.prefix)
fss, _, _ = macfs.ResolveAliasFile(TESTFN2)
! self.assertEqual(fss.as_pathname(), os.path.abspath(test_support.TESTFN))
--- 78,82 ----
macostools.mkalias(test_support.TESTFN, TESTFN2, sys.prefix)
fss, _, _ = macfs.ResolveAliasFile(TESTFN2)
! self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
Index: test_macfs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_macfs.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_macfs.py 28 Jan 2003 21:39:28 -0000 1.1
--- test_macfs.py 5 Feb 2003 11:14:16 -0000 1.2
***************
*** 22,30 ****
def test_fsspec(self):
fss = macfs.FSSpec(test_support.TESTFN)
! self.assertEqual(os.path.abspath(test_support.TESTFN), fss.as_pathname())
def test_fsref(self):
fsr = macfs.FSRef(test_support.TESTFN)
! self.assertEqual(os.path.abspath(test_support.TESTFN), fsr.as_pathname())
def test_coercion(self):
--- 22,30 ----
def test_fsspec(self):
fss = macfs.FSSpec(test_support.TESTFN)
! self.assertEqual(os.path.realpath(test_support.TESTFN), fss.as_pathname())
def test_fsref(self):
fsr = macfs.FSRef(test_support.TESTFN)
! self.assertEqual(os.path.realpath(test_support.TESTFN), fsr.as_pathname())
def test_coercion(self):