subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1661695 - /subversion/trunk/subversion/tests/cmdline/special_tests.py
Date Mon, 23 Feb 2015 14:59:04 GMT
Author: rhuijben
Date: Mon Feb 23 14:59:03 2015
New Revision: 1661695

URL: http://svn.apache.org/r1661695
Log:
* subversion/tests/cmdline/special_tests.py
  (update_obstructing_symlink): Try to fix failing test by storing absolute
    path in the symlink.

Modified:
    subversion/trunk/subversion/tests/cmdline/special_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1661695&r1=1661694&r2=1661695&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Mon Feb 23 14:59:03 2015
@@ -619,13 +619,15 @@ def update_obstructing_symlink(sbox):
   wc_dir = sbox.wc_dir
   mu_path = sbox.ospath('A/mu')
 
+  iota_abspath = os.path.abspath(iota_path)
+
   # delete mu and replace it with an (not-added) symlink
   sbox.simple_rm('A/mu')
-  sbox.simple_symlink(sbox.ospath('iota'), 'A/mu')
+  sbox.simple_symlink(iota_abspath, 'A/mu')
 
   # delete pi and replace it with an added symlink
   sbox.simple_rm('A/D/G/pi')
-  sbox.simple_add_symlink(sbox.ospath('iota'), 'A/D/G/pi')
+  sbox.simple_add_symlink(iota_abspath, 'A/D/G/pi')
 
   if not os.path.exists(mu_path):
       raise svntest.Failure("mu should be there")
@@ -672,7 +674,7 @@ def update_obstructing_symlink(sbox):
       raise svntest.Failure("mu should be there")
   if svntest.main.is_posix_os():
     target = os.readlink(mu_path)
-    if target != iota_path:
+    if target != iota_abspath:
       raise svntest.Failure("mu no longer points to the same location")
 
 def warn_on_reserved_name(sbox):



Mime
View raw message