svn commit: r927444 - /subversion/trunk/subversion/tests/cmdline/revert_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Thu Mar 25 15:13:41 2010
New Revision: 927444

URL: http://svn.apache.org/viewvc?rev=927444&view=rev
Log:
Add XFail test to show that revert is currently broken for added
directories over an not-present BASE_NODE that is only in the parent stub

* subversion/tests/cmdline/revert_tests.py
  (revert_add_over_not_present_dir): New function.
  (test_list): Add revert_add_over_not_present_dir() as XFail test.

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

Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=927444&r1=927443&r2=927444&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Thu Mar 25 15:13:41 2010
@@ -29,7 +29,8 @@ import re, os
 
 # Our testing module
 import svntest
-from svntest import wc
+from svntest import wc, main, actions
+from svntest.actions import run_and_verify_svn
 
 
 # (abbreviation)
@@ -952,6 +953,26 @@ def revert_tree_conflicts_in_updated_fil
   svntest.actions.run_and_verify_status(wc_dir_2, expected_status)
   svntest.actions.verify_disk(wc_dir_2, expected_disk)
 
+def revert_add_over_not_present_dir(sbox):
+  "reverting an add over not present directory"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  main.run_svn(None, 'rm', os.path.join(wc_dir, 'A/C'))
+  main.run_svn(None, 'ci', wc_dir, '-m', 'Deleted dir')
+
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+  expected_status.remove('A/C')
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+  
+  main.run_svn(None, 'mkdir', os.path.join(wc_dir, 'A/C'))
+  
+  # This fails in the current WC-NG state (r927318).
+  main.run_svn(None, 'revert', os.path.join(wc_dir, 'A/C'))
+  
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
 
 ########################################################################
 # Run the tests
@@ -979,6 +1000,7 @@ test_list = [ None,
                    status_of_missing_dir_after_revert_replaced_with_history_dir),
               revert_replaced_with_history_file_2,
               revert_tree_conflicts_in_updated_files,
+              XFail(revert_add_over_not_present_dir),
              ]
 
 if __name__ == '__main__':