svn commit: r987112 - in /subversion/trunk/subversion/tests/cmdline: authz_tests.py svntest/wc.py

[ph...@apache.org]

Author: philip
Date: Thu Aug 19 10:06:39 2010
New Revision: 987112

URL: http://svn.apache.org/viewvc?rev=987112&view=rev
Log:
Mark authz_tests.py 19 as Wimp for single-db.

* subversion/tests/cmdline/authz_tests.py
  (wc_wc_copy_revert): Add additional status verification.
  (test_list): Mark wc_wc_copy_revert as Wimp.

* subversion/tests/cmdline/svntest/wc.py
  (State.from_entries): Drop nodes that are absent=true.

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

Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=987112&r1=987111&r2=987112&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Thu Aug 19 10:06:39 2010
@@ -37,6 +37,7 @@ from svntest.main import server_authz_ha
 # (abbreviation)
 Item = svntest.wc.StateItem
 XFail = svntest.testcase.XFail
+Wimp = svntest.testcase.Wimp
 Skip = svntest.testcase.Skip
 SkipUnless = svntest.testcase.SkipUnless
 
@@ -1021,6 +1022,9 @@ def wc_wc_copy_revert(sbox):
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'revert', '--recursive', sbox.ospath('A2'))
   
+  expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+  expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
+  svntest.actions.run_and_verify_status(sbox.wc_dir, expected_status)
 
 ########################################################################
 # Run the tests
@@ -1051,7 +1055,8 @@ test_list = [ None,
                    svntest.main.is_ra_type_file),
               Skip(multiple_matches, svntest.main.is_ra_type_file),
               Skip(wc_wc_copy, svntest.main.is_ra_type_file),
-              XFail(Skip(wc_wc_copy_revert, svntest.main.is_ra_type_file)),
+              Wimp('Needs single-db', Skip(wc_wc_copy_revert,
+                                           svntest.main.is_ra_type_file)),
              ]
 
 if __name__ == '__main__':

Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=987112&r1=987111&r2=987112&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Thu Aug 19 10:06:39 2010
@@ -579,6 +579,9 @@ class State:
         # DELETED node lives.
         if entry.deleted and entry.schedule != 1:
           continue
+        # entries that are ABSENT don't show up in status
+        if entry.absent:
+          continue
         if name and entry.kind == 2:
           # stub subdirectory. leave a "missing" StateItem in here. note
           # that we can't put the status as "! " because that gets tweaked