svn commit: r946228 - /subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py

[st...@apache.org]

Author: stsp
Date: Wed May 19 15:43:19 2010
New Revision: 946228

URL: http://svn.apache.org/viewvc?rev=946228&view=rev
Log:
Follow-up to r946186: Fix test expectations of merge_authz_test 1.
 
* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths): Don't expect a tree conflict
   for paths which are missing due to authz restrictions.
   Expect the paths to be skipped instead.

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=946228&r1=946227&r2=946228&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Wed May 19 15:43:19 2010
@@ -224,7 +224,6 @@ def mergeinfo_and_skipped_paths(sbox):
   # parent of a missing child and the sibling of missing child, but the former
   # always takes precedence in terms of getting *non*-inheritable mergeinfo.
   expected_output = wc.State(A_COPY_2_path, {
-    'D/G'       : Item(status='  ', treeconflict='C'),
     'D/H/omega' : Item(status='U '),
     })
   expected_mergeinfo_output = wc.State(A_COPY_2_path, {
@@ -238,7 +237,6 @@ def mergeinfo_and_skipped_paths(sbox):
     })
   expected_status = wc.State(A_COPY_2_path, {
     ''          : Item(status=' M', wc_rev=8),
-    'D/G'       : Item(status='! ', treeconflict='C'),
     'D/H/chi'   : Item(status='  ', wc_rev=8),
     'D/H/omega' : Item(status='MM', wc_rev=8),
     'D/H'       : Item(status=' M', wc_rev=8),
@@ -272,6 +270,7 @@ def mergeinfo_and_skipped_paths(sbox):
     })
   expected_skip = wc.State(A_COPY_2_path, {
     'B/E'     : Item(),
+    'D/G'       : Item(),
     'D/H/psi'   : Item(),
     })
   saved_cwd = os.getcwd()