subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1345777 - /subversion/trunk/subversion/tests/cmdline/update_tests.py
Date Sun, 03 Jun 2012 20:54:40 GMT
Author: rhuijben
Date: Sun Jun  3 20:54:39 2012
New Revision: 1345777

URL: http://svn.apache.org/viewvc?rev=1345777&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
  (update_with_parents_and_exclude): Following up on r1345748, remove XFail
    marker after removing accidentally left commented line.

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=1345777&r1=1345776&r2=1345777&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sun Jun  3 20:54:39 2012
@@ -5793,7 +5793,6 @@ def update_nested_move_text_mod(sbox):
                                         None, None, None,
                                         None, None, 1)
 
-@XFail()
 def update_with_parents_and_exclude(sbox):
   "bring a subtree in over an excluded path"
 
@@ -5820,7 +5819,7 @@ def update_with_parents_and_exclude(sbox
                                         sbox.ospath('A'))
 
   expected_output = svntest.wc.State(wc_dir, {
-    # 'A'               : Item(status='A '),
+    'A'                 : Item(status='A '),
     'A/B'               : Item(status='A '),
     'A/B/F'             : Item(status='A '),
     'A/B/E'             : Item(status='A '),
@@ -5841,7 +5840,6 @@ def update_with_parents_and_exclude(sbox
     'iota'              : Item(status='  ', wc_rev='1'),
   })
 
-  # This currently fails as A stays excluded
   svntest.actions.run_and_verify_update(wc_dir,
                                         expected_output,
                                         None,



Mime
View raw message