You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/10/25 02:20:14 UTC

svn commit: r1535590 - /subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py

Author: breser
Date: Fri Oct 25 00:20:13 2013
New Revision: 1535590

URL: http://svn.apache.org/r1535590
Log:
On the 1.7.x-issue4153 branch: Remove some duplicated tests.

r1514944 on 1.7.x added some tests that are roughly identical to the tests
being added by this branch.  This branch is pulling in the tests that match
the tests on trunk for this purpose.  So keep those tests.

* subversion/tests/cmdline/diff_tests.py:
  (basic_diff_summarize): Remove duplicated add file and dir tests.

Modified:
    subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py

Modified: subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py?rev=1535590&r1=1535589&r2=1535590&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/diff_tests.py Fri Oct 25 00:20:13 2013
@@ -2722,30 +2722,6 @@ def basic_diff_summarize(sbox):
   svntest.actions.run_and_verify_diff_summarize(expected_reverse_diff,
                                                 wc_dir, '-c-3')
 
-  # Get the differences between a newly added file 
-  expected_diff = svntest.wc.State(wc_dir, {
-    'newfile': Item(status='A '),
-    })
-  expected_reverse_diff = svntest.wc.State(wc_dir, {
-    'newfile': Item(status='D '),
-    })
-  svntest.actions.run_and_verify_diff_summarize(expected_diff,
-                                                p('newfile'), '-c3')
-  svntest.actions.run_and_verify_diff_summarize(expected_reverse_diff,
-                                                p('newfile'), '-c-3')
-
-  # Get the differences between a newly added dir 
-  expected_diff = svntest.wc.State(wc_dir, {
-    'P': Item(status='A '),
-    })
-  expected_reverse_diff = svntest.wc.State(wc_dir, {
-    'P': Item(status='D '),
-    })
-  svntest.actions.run_and_verify_diff_summarize(expected_diff,
-                                                p('P'), '-c3')
-  svntest.actions.run_and_verify_diff_summarize(expected_reverse_diff,
-                                                p('P'), '-c-3')
-
 #----------------------------------------------------------------------
 def diff_weird_author(sbox):
   "diff with svn:author that has < in it"