svn commit: r989173 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Wed Aug 25 15:34:42 2010
New Revision: 989173

URL: http://svn.apache.org/viewvc?rev=989173&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (query_absent_tree_conflicted_dir): Fix an error in the test which
    was causing it still to XFail although the desired behaviour was
    implemented some time ago.
  (test_list): Remove 'XFail' from that test.

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

Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=989173&r1=989172&r2=989173&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Wed Aug 25 15:34:42 2010
@@ -1134,7 +1134,10 @@ def query_absent_tree_conflicted_dir(sbo
   ## svn: Expected node '/.../tree_conflict_tests-20/A/C' to be added.
 
   # using status:
-  run_and_verify_status(C_C_path, None)
+  expected_output = wc.State(wc_dir, {
+    'A/C/C' : Item(status='? ', treeconflict='C'),
+    })
+  run_and_verify_status(C_C_path, expected_output)
 
   # using info:
   run_and_verify_svn(None, None, [], 'info', C_C_path)
@@ -1264,7 +1267,7 @@ test_list = [ None,
               XFail(force_del_tc_inside),
               XFail(keep_local_del_tc_is_target),
               XFail(force_del_tc_is_target),
-              XFail(query_absent_tree_conflicted_dir),
+              query_absent_tree_conflicted_dir,
               XFail(up_add_onto_add_revert),
               XFail(lock_update_only),
              ]