subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1775615 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Date Thu, 22 Dec 2016 10:40:14 GMT
Author: stsp
Date: Thu Dec 22 10:40:14 2016
New Revision: 1775615

URL: http://svn.apache.org/viewvc?rev=1775615&view=rev
Log:
Improve names of some resolver tests and use seperate test sandboxes.

* subversion/tests/libsvn_client/conflicts-test.c
  (run_test_update_incoming_dir_move_with_nested_file): Add a new parameter
   which specifies the test sandbox name.
  (test_update_incoming_dir_move_with_nested_file_move): Pass sandbox name.
  (test_update_incoming_dir_move_with_nested_file_move2): Rename to ...
  (test_update_incoming_dir_move_with_parent_move): ... this and pass a
   sandbox name.
  (test_update_incoming_dir_move_with_nested_file_move3): Rename to ...
  (test_update_incoming_dir_move_with_parent_moved_back): ... this and pass
   a sandbox name.
  (test_funcs): Track renamed tests and update test descriptions.

Modified:
    subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1775615&r1=1775614&r2=1775615&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Thu Dec 22 10:40:14 2016
@@ -3353,6 +3353,7 @@ run_test_update_incoming_dir_move_with_n
   const svn_test_opts_t *opts,
   svn_boolean_t move_parent,
   svn_boolean_t move_back,
+  const char *sandbox_name,
   apr_pool_t *pool)
 {
   svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
@@ -3371,8 +3372,7 @@ run_test_update_incoming_dir_move_with_n
   svn_client_status_t *status;
   struct status_baton sb;
 
-  SVN_ERR(svn_test__sandbox_create(
-            b, "update_incoming_dir_move_with_moved_file", opts, pool));
+  SVN_ERR(svn_test__sandbox_create(b, sandbox_name, opts, pool));
   SVN_ERR(sbox_add_and_commit_greek_tree(b));
 
   /* Move a directory on the trunk into another directory. */
@@ -3557,30 +3557,31 @@ static svn_error_t *
 test_update_incoming_dir_move_with_nested_file_move(const svn_test_opts_t *opts,
                                                     apr_pool_t *pool)
 {
-  return run_test_update_incoming_dir_move_with_nested_file_move(opts, FALSE,
-                                                                 FALSE, pool);
+  return run_test_update_incoming_dir_move_with_nested_file_move(
+           opts, FALSE, FALSE,
+           "update_incoming_dir_move_with_nested_file_move", pool);
 }
 
 /* Same test as above, but with a moved parent directory. */
 static svn_error_t *
-test_update_incoming_dir_move_with_nested_file_move2(
+test_update_incoming_dir_move_with_parent_move(
   const svn_test_opts_t *opts,
   apr_pool_t *pool)
 {
-  return run_test_update_incoming_dir_move_with_nested_file_move(opts, TRUE,
-                                                                 FALSE,
-                                                                 pool);
+  return run_test_update_incoming_dir_move_with_nested_file_move(
+           opts, TRUE, FALSE,
+           "update_incoming_dir_move_with_parent_move", pool);
 }
 
 /* Same test as above, but with a moved parent directory moved back. */
 static svn_error_t *
-test_update_incoming_dir_move_with_nested_file_move3(
+test_update_incoming_dir_move_with_parent_moved_back(
   const svn_test_opts_t *opts,
   apr_pool_t *pool)
 {
-  return run_test_update_incoming_dir_move_with_nested_file_move(opts, TRUE,
-                                                                 TRUE,
-                                                                 pool);
+  return run_test_update_incoming_dir_move_with_nested_file_move(
+           opts, TRUE, TRUE,
+           "update_incoming_dir_move_with_parent_moved_back", pool);
 }
 
 /* A helper function which prepares a working copy for the tests below. */
@@ -4293,10 +4294,10 @@ static struct svn_test_descriptor_t test
                        "merge incoming file move with new line of history"),
     SVN_TEST_OPTS_PASS(test_update_incoming_dir_move_with_nested_file_move,
                        "update incoming dir move with nested file move"),
-    SVN_TEST_OPTS_PASS(test_update_incoming_dir_move_with_nested_file_move2,
-                       "update incoming dir move with nested file move 2"),
-    SVN_TEST_OPTS_PASS(test_update_incoming_dir_move_with_nested_file_move3,
-                       "update incoming dir move with nested file move 3"),
+    SVN_TEST_OPTS_PASS(test_update_incoming_dir_move_with_parent_move,
+                       "update incoming dir move with parent move"),
+    SVN_TEST_OPTS_PASS(test_update_incoming_dir_move_with_parent_moved_back,
+                       "update incoming dir move with parent moved back"),
     SVN_TEST_OPTS_PASS(test_update_incoming_added_file_text_merge,
                        "update incoming add file text merge"),
     SVN_TEST_OPTS_PASS(test_merge_incoming_move_file_prop_merge_conflict,



Mime
View raw message