subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1836336 - /subversion/trunk/subversion/tests/cmdline/diff_tests.py
Date Fri, 20 Jul 2018 09:27:48 GMT
Author: julianfoad
Date: Fri Jul 20 09:27:48 2018
New Revision: 1836336

URL: http://svn.apache.org/viewvc?rev=1836336&view=rev
Log:
* subversion/tests/cmdline/diff_tests.py
  (diff_file_replaced_by_symlink): New test.
  (test_list): Run it.

Patch by: Dmitry Pavlenko <pavlenko{_AT_}tmatesoft.com
(tweaked by me, following danielsh's suggestions)

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

Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1836336&r1=1836335&r2=1836336&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Jul 20 09:27:48 2018
@@ -5201,6 +5201,22 @@ def diff_summary_repo_wc_local_copy_unmo
                     '--old=' + sbox.ospath('iota') + '@HEAD',
                     '--new=' + sbox.ospath('iota2'))
 
+@XFail()
+def diff_file_replaced_by_symlink(sbox):
+  "diff base vs working: symlink replaces a file"
+  sbox.build(read_only=True)
+  wc_dir = sbox.wc_dir
+
+  iota_path = sbox.ospath('iota')
+  os.remove(iota_path)
+
+  # create a symlink pointing to itself
+  # alternatively it could point to a non-existing path
+  sbox.simple_symlink('iota', 'iota')
+
+  # TODO: add a full expected output
+  expected_output = svntest.verify.AnyOutput
+  svntest.actions.run_and_verify_svn(expected_output, [], 'diff', wc_dir)
 
 ########################################################################
 #Run the tests
@@ -5300,6 +5316,7 @@ test_list = [ None,
               diff_unversioned_files_git,
               diff_summary_repo_wc_local_copy,
               diff_summary_repo_wc_local_copy_unmodified,
+              diff_file_replaced_by_symlink,
               ]
 
 if __name__ == '__main__':



Mime
View raw message