svn commit: r1035347 - /subversion/trunk/subversion/tests/cmdline/update_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Mon Nov 15 16:37:05 2010
New Revision: 1035347

URL: http://svn.apache.org/viewvc?rev=1035347&view=rev
Log:
Add a test for a bug in 'update' that I have just found.

* subversion/tests/cmdline/update_tests.py
  (update_nonexistent_child_of_copy): New test.
  (test_list): Add the new test, as XFail.

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=1035347&r1=1035346&r2=1035347&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Nov 15 16:37:05 2010
@@ -5317,7 +5317,24 @@ def update_with_file_lock_and_keywords_p
   if (mu_ts_before_update != mu_ts_after_update):
     print("The timestamp of 'mu' before and after update does not match.")
     raise svntest.Failure
-  
+
+#----------------------------------------------------------------------
+# Updating a nonexistent or deleted path should be a successful no-op,
+# when there is no incoming change.  In trunk@1035343, such an update
+# within a copied directory triggered an assertion failure.
+def update_nonexistent_child_of_copy(sbox):
+  """update a nonexistent child of a copied dir"""
+  sbox.build()
+  os.chdir(sbox.wc_dir)
+
+  svntest.main.run_svn(None, 'copy', 'A', 'A2')
+
+  # Try updating a nonexistent path in the copied dir.
+  svntest.main.run_svn(None, 'update', os.path.join('A2', 'nonexistent'))
+
+  # Try updating a deleted path in the copied dir.
+  svntest.main.run_svn(None, 'delete', os.path.join('A2', 'mu'))
+  svntest.main.run_svn(None, 'update', os.path.join('A2', 'mu'))
 
 #######################################################################
 # Run the tests
@@ -5382,7 +5399,8 @@ test_list = [ None,
               XFail(update_empty_hides_entries),
               mergeinfo_updates_merge_with_local_mods,
               update_with_excluded_subdir,
-              XFail(update_with_file_lock_and_keywords_property_set)
+              XFail(update_with_file_lock_and_keywords_property_set),
+              XFail(update_nonexistent_child_of_copy),
              ]
 
 if __name__ == '__main__':