svn commit: r1455942 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 13 13:56:25 2013
New Revision: 1455942

URL: http://svn.apache.org/r1455942
Log:
While expanding the move_depth_expand test, I found another assertion.
Commit the current state to have a regression test for that.

* subversion/tests/libsvn_wc/op-depth-test.c
  (move_depth_expand): Expand test towards more expansion cases.
  (test_funcs): Mark XFail again.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1455942&r1=1455941&r2=1455942&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Mar 13 13:56:25 2013
@@ -7682,20 +7682,24 @@ move_depth_expand(const svn_test_opts_t 
   SVN_ERR(sbox_wc_mkdir(&b, "A/A"));
   SVN_ERR(sbox_wc_mkdir(&b, "A/A/A"));
   SVN_ERR(sbox_wc_mkdir(&b, "A/A/A/A"));
-  SVN_ERR(sbox_wc_mkdir(&b, "A/A/A/A/A"));
-  SVN_ERR(sbox_wc_mkdir(&b, "A/A/A/A/A/A"));
+  SVN_ERR(sbox_wc_mkdir(&b, "A/B"));
+  SVN_ERR(sbox_wc_mkdir(&b, "A/B/A"));
+  SVN_ERR(sbox_wc_mkdir(&b, "A/B/A/A"));
   SVN_ERR(sbox_wc_commit(&b, ""));
   SVN_ERR(sbox_wc_update(&b, "", 0));
 
   SVN_ERR(sbox_wc_update_depth(&b, "", 1, svn_depth_immediates, TRUE));
   SVN_ERR(sbox_wc_update_depth(&b, "A", 1, svn_depth_immediates, TRUE));
+  /* Make A/B not present */
+  SVN_ERR(sbox_wc_update_depth(&b, "A/B", 0, svn_depth_immediates, TRUE));
 
   SVN_ERR(sbox_wc_move(&b, "A", "C"));
-  SVN_ERR(sbox_wc_mkdir(&b, "C/A/A"));
+  SVN_ERR(sbox_wc_mkdir(&b, "C/A/A")); /* Local addition obstruction */
+  SVN_ERR(sbox_wc_copy(&b, "C/A", "C/B")); /* Copied obstruction */
 
   SVN_ERR(sbox_wc_update_depth(&b, "", 1, svn_depth_infinity, TRUE));
 
-  /* This causes a segfault */
+  /* This used to cause a segfault. Now it asserts in a different place */
   SVN_ERR(sbox_wc_resolve(&b, "A", svn_depth_empty,
                           svn_wc_conflict_choose_mine_conflict));
 
@@ -7855,7 +7859,7 @@ struct svn_test_descriptor_t test_funcs[
                        "move_update_subtree (issue 4232)"),
     SVN_TEST_OPTS_PASS(move_parent_into_child,
                        "move_parent_into_child (issue 4333)"),
-    SVN_TEST_OPTS_PASS(move_depth_expand,
+    SVN_TEST_OPTS_XFAIL(move_depth_expand,
                        "move depth expansion"),
     SVN_TEST_NULL
   };