You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/01/15 22:12:36 UTC
svn commit: r1558566 - in /subversion/trunk/subversion/tests/libsvn_wc:
db-test.c utils.c
Author: rhuijben
Date: Wed Jan 15 21:12:36 2014
New Revision: 1558566
URL: http://svn.apache.org/r1558566
Log:
Cleanup test infrastructure creation a bit.
* subversion/tests/libsvn_wc/db-test.c
(create_open): Remove tree before creating new data.
* subversion/tests/libsvn_wc/utils.c
(svn_test__create_fake_wc): Remove single file DB delete right before
creating the new database.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
subversion/trunk/subversion/tests/libsvn_wc/utils.c
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1558566&r1=1558565&r2=1558566&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Wed Jan 15 21:12:36 2014
@@ -343,11 +343,13 @@ create_open(svn_wc__db_t **db,
subdir, pool),
pool));
- svn_test_add_dir_cleanup(*local_abspath);
+ SVN_ERR(svn_io_remove_dir2(*local_abspath, TRUE, NULL, NULL, pool));
SVN_ERR(svn_wc__db_open(db, NULL, FALSE, TRUE, pool, pool));
SVN_ERR(svn_test__create_fake_wc(*local_abspath, TESTING_DATA, pool, pool));
+ svn_test_add_dir_cleanup(*local_abspath);
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1558566&r1=1558565&r2=1558566&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Wed Jan 15 21:12:36 2014
@@ -112,8 +112,6 @@ svn_test__create_fake_wc(const char *wc_
{
const char *dotsvn_abspath = svn_dirent_join(wc_abspath, ".svn",
scratch_pool);
- const char *db_abspath = svn_dirent_join(dotsvn_abspath, "wc.db",
- scratch_pool);
svn_sqlite__db_t *sdb;
const char **my_statements;
int i;
@@ -130,8 +128,6 @@ svn_test__create_fake_wc(const char *wc_
/* Create fake-wc/SUBDIR/.svn/ for placing the metadata. */
SVN_ERR(svn_io_make_dir_recursively(dotsvn_abspath, scratch_pool));
-
- svn_error_clear(svn_io_remove_file2(db_abspath, FALSE, scratch_pool));
SVN_ERR(svn_wc__db_util_open_db(&sdb, wc_abspath, "wc.db",
svn_sqlite__mode_rwcreate,
FALSE /* exclusive */, my_statements,