svn commit: r1580863 - /subversion/trunk/subversion/tests/cmdline/special_tests.py

[ph...@apache.org]

Author: philip
Date: Mon Mar 24 14:25:02 2014
New Revision: 1580863

URL: http://svn.apache.org/r1580863
Log:
Add an XFAIL regression test for issue 4482, multiline svn:special file
shows as status modified.

* subversion/tests/cmdline/special_tests.py
  (multiline_symlink_special): New test.
  (test_list): Add new test.

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

Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1580863&r1=1580862&r2=1580863&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Mon Mar 24 14:25:02 2014
@@ -1247,6 +1247,38 @@ def multiline_special(sbox):
                       props={'svn:special' : '*'})
   svntest.actions.verify_disk(wc_dir, expected_disk.old_tree(), True)
 
+#----------------------------------------------------------------------
+@Issue(4482)
+@XFail(svntest.main.is_posix_os)
+def multiline_symlink_special(sbox):
+  "multiline link file with svn:special"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  sbox.simple_append('dodgy-link1', 'link foo\n')
+  sbox.simple_append('dodgy-link2', 'link foo\nbar\n')
+  svntest.main.run_svnmucc('put', sbox.ospath('dodgy-link1'), 'dodgy-link1',
+                           'put', sbox.ospath('dodgy-link2'), 'dodgy-link2',
+                           'propset', 'svn:special', 'X', 'dodgy-link1',
+                           'propset', 'svn:special', 'X', 'dodgy-link2',
+                           '-U', sbox.repo_url,
+                           '-m', 'Create dodgy symlinks')
+  os.remove(sbox.ospath('dodgy-link1'))
+  os.remove(sbox.ospath('dodgy-link2'))
+
+  sbox.simple_update();
+
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+  expected_status.add({
+      'dodgy-link1' : Item(status='  ', wc_rev=2),
+      'dodgy-link2' : Item(status='  ', wc_rev=2),
+      })
+  # XFAIL: Only content before \n used when creating the link but all
+  # content used when detecting modifications, so the pristine working
+  # copy shows up as modified.
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
 ########################################################################
 # Run the tests
 
@@ -1279,6 +1311,7 @@ test_list = [ None,
               cat_added_symlink,
               incoming_symlink_changes,
               multiline_special,
+              multiline_symlink_special,
              ]
 
 if __name__ == '__main__':