svn commit: r1652200 - /subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Thu Jan 15 17:58:42 2015
New Revision: 1652200

URL: http://svn.apache.org/r1652200
Log:
Add another case to the regression tests for issue #4551 'svnrdump load
commits wrong properties, or fails, on a non-deltas dumpfile'.

* subversion/tests/cmdline/svnrdump_tests.py
  (load_non_deltas_copy_with_props): Also test a child of a copy, as a more
    extensive fix is required to get this case right.

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

Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1652200&r1=1652199&r2=1652200&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Thu Jan 15 17:58:42 2015
@@ -831,8 +831,8 @@ def load_non_deltas_copy_with_props(sbox
   "load non-deltas copy with props"
   sbox.build()
 
-  # Set props on a file and on a dir
-  sbox.simple_propset('p', 'v', 'A/mu', 'A/B')
+  # Set props on a file and on a dir and on a child of the dir to be copied
+  sbox.simple_propset('p', 'v', 'A/mu', 'A/B', 'A/B/E')
   sbox.simple_commit()
   sbox.simple_update()  # avoid mixed-rev
 
@@ -841,7 +841,7 @@ def load_non_deltas_copy_with_props(sbox
   sbox.simple_copy('A/mu@2', 'A/mu_COPY')
   sbox.simple_copy('A/B@2', 'A/B_COPY')
   # On the copy, delete a prop
-  sbox.simple_propdel('p', 'A/mu_COPY', 'A/B_COPY')
+  sbox.simple_propdel('p', 'A/mu_COPY', 'A/B_COPY', 'A/B_COPY/E')
 
   sbox.simple_commit()