subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1558946 - /subversion/trunk/subversion/tests/libsvn_client/client-test.c
Date Thu, 16 Jan 2014 22:53:39 GMT
Author: breser
Date: Thu Jan 16 22:53:38 2014
New Revision: 1558946

URL: http://svn.apache.org/r1558946
Log:
Prevent spurious failures in client-test 8 when CLEANUP isn't used.

* subversion/tests/libsvn_client/client-test.c
  (test_suggest_mergesources): Have to remove the wc before doing
    a checkout, otherwise you get an error on UUID mismatches.

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

Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1558946&r1=1558945&r2=1558946&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Thu Jan 16 22:53:38 2014
@@ -804,6 +804,7 @@ test_suggest_mergesources(const svn_test
   /* And now test the same thing with a minimal working copy */
   wc_dir = svn_test_data_path("mergesources-wc", pool);
   svn_test_add_dir_cleanup(wc_dir);
+  SVN_ERR(svn_io_remove_dir2(wc_dir, TRUE, NULL, NULL, pool));
 
   head_rev.kind = svn_opt_revision_head;
   SVN_ERR(svn_client_checkout3(NULL,



Mime
View raw message