svn commit: r1437664 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Wed Jan 23 19:55:56 2013
New Revision: 1437664

URL: http://svn.apache.org/viewvc?rev=1437664&view=rev
Log:
Update expected results of upgrade_tests.py 29, to make it pass in !maintainer
mode.

* subversion/tests/cmdline/svntest/wc.py
  (tweak_for_entries_compare): Don't remove from entries if the node has an
    entry_status. Sensible override for this specific case.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_missing_replaced): Mark Wimp instead of XFail. Update
    expected results.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/wc.py
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1437664&r1=1437663&r2=1437664&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Wed Jan 23 19:55:56 2013
@@ -337,7 +337,8 @@ class State:
       if item.status:
         # If this is an unversioned tree-conflict, remove it.
         # These are only in their parents' THIS_DIR, they don't have entries.
-        if item.status[0] in '!?' and item.treeconflict == 'C':
+        if item.status[0] in '!?' and item.treeconflict == 'C' and \
+                                      item.entry_status is None:
           del self.desc[path]
         # Normal externals are not stored in the parent wc, drop the root
         # and everything in these working copies

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1437664&r1=1437663&r2=1437664&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Jan 23 19:55:56 2013
@@ -1206,7 +1206,7 @@ def upgrade_file_externals(sbox):
 
 
 @Issue(4035)
-@XFail()
+@Wimp('Fails in maintainer mode')
 def upgrade_missing_replaced(sbox):
   "upgrade with missing replaced dir"
 
@@ -1221,12 +1221,14 @@ def upgrade_missing_replaced(sbox):
                                      sbox.wc_dir)
 
   expected_output = svntest.wc.State(sbox.wc_dir, {
-      'A/B/E'         : Item(status='  ', treeconflict='C', prev_verb='Restored'),
+      'A/B/E'         : Item(status='  ', treeconflict='C',
+                             prev_verb='Restored'),
       'A/B/E/alpha'   : Item(status='  ', treeconflict='A'),
       'A/B/E/beta'    : Item(status='  ', treeconflict='A'),
       })
   expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
-  expected_status.tweak('A/B/E', status='! ', treeconflict='C', wc_rev='-')
+  expected_status.tweak('A/B/E', status='! ', treeconflict='C', wc_rev='-',
+                        entry_status='R ', entry_rev='1')
   expected_status.tweak('A/B/E/alpha', 'A/B/E/beta', status='D ')
   svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
                                         None, expected_status)