svn commit: r1604736 - /subversion/trunk/subversion/tests/cmdline/diff_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Mon Jun 23 10:46:01 2014
New Revision: 1604736

URL: http://svn.apache.org/r1604736
Log:
Add regression test for issue
Found by: Mikhail Veltishchev <dichlofos-mv{_AT_}yandex.ru>
which applies to both trunk and 1.8.x

* subversion/tests/cmdline/diff_tests.py
  (diff_parent_dir): New test, marked XFail because it triggers an assertion.
  (test_list): Add new test.

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=1604736&r1=1604735&r2=1604736&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Mon Jun 23 10:46:01 2014
@@ -4675,6 +4675,23 @@ def diff_switched_file(sbox):
   svntest.actions.run_and_verify_svn(None, expected_output, [],
                                      'diff', '-r', '1', sbox.ospath(''))
 
+@XFail()
+def diff_parent_dir(sbox):
+  "diff parent directory"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  was_cwd = os.getcwd()
+  os.chdir(os.path.join(wc_dir, 'A', 'B'))
+  try:
+    # This currently (1.8.9, 1.9.0 development) triggers an assertion failure
+    # as a non canonical relpath ".." is used as diff target
+    svntest.actions.run_and_verify_svn(None, None, [],
+                                     'diff', '-r', '1', '..')
+  finally:
+    os.chdir(was_cwd)
+
 
 ########################################################################
 #Run the tests
@@ -4762,6 +4779,7 @@ test_list = [ None,
               diff_repo_wc_file_props,
               diff_repo_repo_added_file_mime_type,
               diff_switched_file,
+              diff_parent_dir,
               ]
 
 if __name__ == '__main__':