svn commit: r1039424 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

[ph...@apache.org]

Author: philip
Date: Fri Nov 26 15:43:54 2010
New Revision: 1039424

URL: http://svn.apache.org/viewvc?rev=1039424&view=rev
Log:
Followup to r1038999.  Doing wc copies per-node means an authz
failure leaves incomplete directories.  This reverts the testsuite
change made in r1028673.

* subversion/tests/cmdline/authz_tests.py
  (wc_wc_copy): Expect incomplete directory.

Modified:
    subversion/trunk/subversion/tests/cmdline/authz_tests.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=1039424&r1=1039423&r2=1039424&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Fri Nov 26 15:43:54 2010
@@ -1003,8 +1003,17 @@ def wc_wc_copy(sbox):
                                      'svn: Cannot copy.*excluded by server',
                                      'cp', sbox.ospath('A'), sbox.ospath('A2'))
 
-  # The copy failed, no change in status
-  svntest.actions.run_and_verify_status(sbox.wc_dir, expected_status)
+
+  # The copy failed and A2/B/E is incomplete.  That means A2 and A2/B
+  # are complete, but for the other parts of A2 the status is undefined.
+  expected_output = svntest.verify.ExpectedOutput(
+    ['A  +             -        1 jrandom      ' + sbox.ospath('A2') + '\n',
+     '   +             -        1 jrandom      ' + sbox.ospath('A2/B') + '\n',
+     '!               ?        ?   ?           ' + sbox.ospath('A2/B/E') + '\n',
+     ])
+  expected_output.match_all = False
+  svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                     'st', '--verbose', sbox.ospath('A2'))
 
 def wc_wc_copy_revert(sbox):
   "wc-to-wc-copy with absent nodes and then revert"