Revert r1412515 then?
Hyrum K Wright wrote on Fri, Nov 23, 2012 at 15:29:32 -0500: > I did a little poking and fixed this in r1413046. > > > On Fri, Nov 23, 2012 at 2:18 PM, Hyrum K Wright <hy...@hyrumwright.org>wrote: > > > This test isn't cleaning up after itself (or before a subsequent run). > > The first time I run it in a working copy, it passes, but the next time, I > > get the following error: > > > > $ ./fs-test 37 > > subversion/tests/libsvn_fs/fs-test.c:4908: (apr_err=160033) > > subversion/tests/svn_test_fs.c:183: (apr_err=160033) > > subversion/tests/svn_test_fs.c:121: (apr_err=160033) > > svn_tests: E160033: cannot create fs 'test-delete-fs' there is already a > > directory of that name > > subversion/libsvn_fs/fs-loader.c:515: (apr_err=160033) > > subversion/libsvn_fs/fs-loader.c:322: (apr_err=160033) > > subversion/libsvn_fs/fs-loader.c:162: (apr_err=160033) > > svn_tests: E160033: Failed to load module for FS type 'bdb' > > FAIL: fs-test 37: test svn_fs_delete_fs > > > > I suspect there's some boilerplate somewhere that was left out. > > > > -Hyrum > > > > > > On Tue, Nov 20, 2012 at 6:52 AM, <phi...@apache.org> wrote: > > > >> Author: philip > >> Date: Tue Nov 20 11:52:56 2012 > >> New Revision: 1411629 > >> > >> URL: http://svn.apache.org/viewvc?rev=1411629&view=rev > >> Log: > >> Explicitly test svn_fs_delete_fs. > >> > >> * subversion/tests/libsvn_fs/fs-test.c > >> (delete_fs): New test. > >> (test_list): Add new test. > >> > >> Modified: > >> subversion/trunk/subversion/tests/libsvn_fs/fs-test.c > >> > >> Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c > >> URL: > >> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1411629&r1=1411628&r2=1411629&view=diff > >> > >> ============================================================================== > >> --- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original) > >> +++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Tue Nov 20 > >> 11:52:56 2012 > >> @@ -4896,6 +4896,26 @@ node_history(const svn_test_opts_t *opts > >> return SVN_NO_ERROR; > >> } > >> > >> +/* Test svn_fs_delete_fs(). */ > >> +static svn_error_t * > >> +delete_fs(const svn_test_opts_t *opts, > >> + apr_pool_t *pool) > >> +{ > >> + svn_fs_t *fs; > >> + const char *path; > >> + svn_node_kind_t kind; > >> + > >> + SVN_ERR(svn_test__create_fs(&fs, "test-delete-fs", opts, pool)); > >> + path = svn_fs_path(fs, pool); > >> + SVN_ERR(svn_io_check_path(path, &kind, pool)); > >> + SVN_TEST_ASSERT(kind != svn_node_none); > >> + SVN_ERR(svn_fs_delete_fs(path, pool)); > >> + SVN_ERR(svn_io_check_path(path, &kind, pool)); > >> + SVN_TEST_ASSERT(kind == svn_node_none); > >> + > >> + return SVN_NO_ERROR; > >> +} > >> + > >> > >> > >> /* > >> ------------------------------------------------------------------------ */ > >> @@ -4979,5 +4999,7 @@ struct svn_test_descriptor_t test_funcs[ > >> "create and modify small file"), > >> SVN_TEST_OPTS_PASS(node_history, > >> "test svn_fs_node_history"), > >> + SVN_TEST_OPTS_PASS(delete_fs, > >> + "test svn_fs_delete_fs"), > >> SVN_TEST_NULL > >> }; > >> > >> > >> > >
