svn commit: r1411628 - /subversion/trunk/subversion/tests/svn_test_fs.c

[ph...@apache.org]

Author: philip
Date: Tue Nov 20 11:52:25 2012
New Revision: 1411628

URL: http://svn.apache.org/viewvc?rev=1411628&view=rev
Log:
Provide a more explicit error message when removing the remnants of
a previous run fails.

* subversion/tests/svn_test_fs.c
  (create_fs): Tweak error messages.

Modified:
    subversion/trunk/subversion/tests/svn_test_fs.c

Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1411628&r1=1411627&r2=1411628&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Tue Nov 20 11:52:25 2012
@@ -115,10 +115,14 @@ create_fs(svn_fs_t **fs_p,
   if (apr_stat(&finfo, name, APR_FINFO_TYPE, pool) == APR_SUCCESS)
     {
       if (finfo.filetype == APR_DIR)
-        SVN_ERR(svn_fs_delete_fs(name, pool));
+        SVN_ERR_W(svn_fs_delete_fs(name, pool),
+                  apr_psprintf(pool,
+                               "cannot create fs '%s' there is already "
+                               "a directory of that name", name));
       else
         return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
-                                 "there is already a file named '%s'", name);
+                                 "cannot create fs '%s' there is already "
+                                 "a file of that name", name);
     }
 
   SVN_ERR(svn_fs_create(fs_p, name, fs_config, pool));