subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r881434 - /subversion/trunk/subversion/tests/cmdline/update_tests.py
Date Tue, 17 Nov 2009 18:33:56 GMT
Author: pburba
Date: Tue Nov 17 18:33:55 2009
New Revision: 881434

URL: http://svn.apache.org/viewvc?rev=881434&view=rev
Log:
Tie an update test to its issue.

* subversion/tests/cmdline/update_tests.py
  (update_deleted_locked_files): Note that this is a test for issue #3525
   and that its XFailing status is dependent on a fix of that issue.

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

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=881434&r1=881433&r2=881434&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue Nov 17 18:33:55 2009
@@ -4806,6 +4806,10 @@
                                      "up", other_wc_dir)
 
 #----------------------------------------------------------------------
+# Test for issue #3525 'Locked file which is scheduled for delete causes
+# tree conflict'
+#
+# Marked as XFail until that issue is fixed.
 def update_deleted_locked_files(sbox):
   "verify update of deleted locked files"
 
@@ -4813,13 +4817,12 @@
 
   sbox.build()
   wc_dir = sbox.wc_dir
-
   iota = os.path.join(wc_dir, 'iota')
   E = os.path.join(wc_dir, 'A', 'B', 'E')
   alpha = os.path.join(E, 'alpha')
 
-  svntest.main.run_svn(None, 'lock', iota, alpha)
-  svntest.main.run_svn(None, 'delete', iota, E)
+  svntest.main.run_svn(None, 'lock', alpha)#iota, alpha)
+  svntest.main.run_svn(None, 'delete', E)#iota, E)
 
   expected_output = svntest.wc.State(wc_dir, {})
   expected_disk = svntest.main.greek_state.copy()
@@ -4835,6 +4838,8 @@
                         'A/B/E/alpha',
                         'A/B/E/beta',
                         status='D ')
+  # Issue #3525 manifests itself here; the update causes a spurious
+  # tree conflict.
   svntest.actions.run_and_verify_update(wc_dir,
                                         expected_output,
                                         expected_disk,



Mime
View raw message