You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/16 16:38:46 UTC
svn commit: r1339190 -
/subversion/trunk/subversion/tests/cmdline/diff_tests.py
Author: stsp
Date: Wed May 16 14:38:45 2012
New Revision: 1339190
URL: http://svn.apache.org/viewvc?rev=1339190&view=rev
Log:
Add a regression test for 'svn diff --properties-only'.
* subversion/tests/cmdline/diff_tests.py
(diff_properties_only, test_list): 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=1339190&r1=1339189&r2=1339190&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed May 16 14:38:45 2012
@@ -4014,6 +4014,50 @@ def diff_arbitrary_files_and_dirs(sbox):
'diff', '--old', sbox.ospath('A/B/E'),
'--new', sbox.ospath('A/D'))
+def diff_properties_only(sbox):
+ "diff --properties-only"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ expected_output = \
+ make_diff_header("iota", "revision 1", "revision 2") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("svn:eol-style", "native")
+
+ expected_reverse_output = \
+ make_diff_header("iota", "revision 2", "revision 1") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_deleted("svn:eol-style", "native")
+
+ expected_rev1_output = \
+ make_diff_header("iota", "revision 1", "working copy") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("svn:eol-style", "native")
+
+ # Make a property change and a content chang to 'iota'
+ # Only the property change should be displayed by diff --properties-only
+ sbox.simple_propset('svn:eol-style', 'native', 'iota')
+ svntest.main.file_append(sbox.ospath('iota'), 'new text\n')
+
+ sbox.simple_commit() # r2
+
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'diff', '--properties-only', '-r', '1:2',
+ sbox.repo_url + '/iota')
+
+ svntest.actions.run_and_verify_svn(None, expected_reverse_output, [],
+ 'diff', '--properties-only', '-r', '2:1',
+ sbox.repo_url + '/iota')
+
+ os.chdir(wc_dir)
+ svntest.actions.run_and_verify_svn(None, expected_rev1_output, [],
+ 'diff', '--properties-only', '-r', '1',
+ 'iota')
+
+ svntest.actions.run_and_verify_svn(None, expected_rev1_output, [],
+ 'diff', '--properties-only',
+ '-r', 'PREV', 'iota')
########################################################################
#Run the tests
@@ -4085,6 +4129,7 @@ test_list = [ None,
diff_two_working_copies,
diff_deleted_url,
diff_arbitrary_files_and_dirs,
+ diff_properties_only,
]
if __name__ == '__main__':