diff options
Diffstat (limited to 'subversion/tests/svn_test_fs.c')
| -rw-r--r-- | subversion/tests/svn_test_fs.c | 265 |
1 files changed, 191 insertions, 74 deletions
diff --git a/subversion/tests/svn_test_fs.c b/subversion/tests/svn_test_fs.c index 2dcb096..2d62f64 100644 --- a/subversion/tests/svn_test_fs.c +++ b/subversion/tests/svn_test_fs.c @@ -75,13 +75,14 @@ make_fs_config(const char *fs_type, apr_pool_t *pool) { apr_hash_t *fs_config = apr_hash_make(pool); - apr_hash_set(fs_config, SVN_FS_CONFIG_BDB_TXN_NOSYNC, - APR_HASH_KEY_STRING, "1"); - apr_hash_set(fs_config, SVN_FS_CONFIG_FS_TYPE, - APR_HASH_KEY_STRING, - fs_type); + + svn_hash_sets(fs_config, SVN_FS_CONFIG_BDB_TXN_NOSYNC, "1"); + svn_hash_sets(fs_config, SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE, "1"); + svn_hash_sets(fs_config, SVN_FS_CONFIG_FS_TYPE, fs_type); if (server_minor_version) { + svn_hash_sets(fs_config, SVN_FS_CONFIG_COMPATIBLE_VERSION, + apr_psprintf(pool, "1.%d.0", server_minor_version)); if (server_minor_version == 6 || server_minor_version == 7) svn_hash_sets(fs_config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE, "1"); else if (server_minor_version == 5) @@ -103,28 +104,20 @@ create_fs(svn_fs_t **fs_p, const char *name, const char *fs_type, int server_minor_version, + apr_hash_t *overlay_fs_config, apr_pool_t *pool) { - apr_finfo_t finfo; apr_hash_t *fs_config = make_fs_config(fs_type, server_minor_version, pool); + if (overlay_fs_config) + fs_config = apr_hash_overlay(pool, overlay_fs_config, fs_config); + /* If there's already a repository named NAME, delete it. Doing things this way means that repositories stick around after a failure for postmortem analysis, but also that tests can be re-run without cleaning out the repositories created by prior runs. */ - if (apr_stat(&finfo, name, APR_FINFO_TYPE, pool) == APR_SUCCESS) - { - if (finfo.filetype == APR_DIR) - SVN_ERR_W(svn_io_remove_dir2(name, TRUE, NULL, NULL, 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, - "cannot create fs '%s' there is already " - "a file of that name", name); - } + SVN_ERR(svn_io_remove_dir2(name, TRUE, NULL, NULL, pool)); SVN_ERR(svn_fs_create(fs_p, name, fs_config, pool)); if (! *fs_p) @@ -144,21 +137,36 @@ create_fs(svn_fs_t **fs_p, * copy that file into the filesystem FS and set *MUST_REOPEN to TRUE, else * set *MUST_REOPEN to FALSE. */ static svn_error_t * -maybe_install_fsfs_conf(svn_fs_t *fs, - const svn_test_opts_t *opts, - svn_boolean_t *must_reopen, - apr_pool_t *pool) +maybe_install_fs_conf(svn_fs_t *fs, + const svn_test_opts_t *opts, + svn_boolean_t *must_reopen, + apr_pool_t *pool) { *must_reopen = FALSE; - if (strcmp(opts->fs_type, "fsfs") != 0 || ! opts->config_file) + if (! opts->config_file) return SVN_NO_ERROR; - *must_reopen = TRUE; - return svn_io_copy_file(opts->config_file, - svn_path_join(svn_fs_path(fs, pool), - "fsfs.conf", pool), - FALSE /* copy_perms */, - pool); + if (strcmp(opts->fs_type, "fsfs") == 0) + { + *must_reopen = TRUE; + return svn_io_copy_file(opts->config_file, + svn_path_join(svn_fs_path(fs, pool), + "fsfs.conf", pool), + FALSE /* copy_perms */, + pool); + } + + if (strcmp(opts->fs_type, "fsx") == 0) + { + *must_reopen = TRUE; + return svn_io_copy_file(opts->config_file, + svn_path_join(svn_fs_path(fs, pool), + "fsx.conf", pool), + FALSE /* copy_perms */, + pool); + } + + return SVN_NO_ERROR; } @@ -168,80 +176,151 @@ svn_test__create_bdb_fs(svn_fs_t **fs_p, const svn_test_opts_t *opts, apr_pool_t *pool) { - return create_fs(fs_p, name, "bdb", opts->server_minor_version, pool); + return create_fs(fs_p, name, "bdb", opts->server_minor_version, NULL, pool); } svn_error_t * -svn_test__create_fs(svn_fs_t **fs_p, - const char *name, - const svn_test_opts_t *opts, - apr_pool_t *pool) +svn_test__create_fs2(svn_fs_t **fs_p, + const char *name, + const svn_test_opts_t *opts, + apr_hash_t *fs_config, + apr_pool_t *pool) { svn_boolean_t must_reopen; - SVN_ERR(create_fs(fs_p, name, opts->fs_type, - opts->server_minor_version, pool)); + SVN_ERR(create_fs(fs_p, name, opts->fs_type, opts->server_minor_version, + fs_config, pool)); - SVN_ERR(maybe_install_fsfs_conf(*fs_p, opts, &must_reopen, pool)); + SVN_ERR(maybe_install_fs_conf(*fs_p, opts, &must_reopen, pool)); if (must_reopen) { - SVN_ERR(svn_fs_open(fs_p, name, NULL, pool)); + SVN_ERR(svn_fs_open2(fs_p, name, NULL, pool, pool)); svn_fs_set_warning_func(*fs_p, fs_warning_handler, NULL); } return SVN_NO_ERROR; } +svn_error_t * +svn_test__create_fs(svn_fs_t **fs_p, + const char *name, + const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + return svn_test__create_fs2(fs_p, name, opts, NULL, pool); +} svn_error_t * -svn_test__create_repos(svn_repos_t **repos_p, - const char *name, - const svn_test_opts_t *opts, - apr_pool_t *pool) +svn_test__create_repos2(svn_repos_t **repos_p, + const char **repos_url, + const char **repos_dirent, + const char *name, + const svn_test_opts_t *opts, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { - apr_finfo_t finfo; svn_repos_t *repos; svn_boolean_t must_reopen; + const char *repos_abspath; + apr_pool_t *repos_pool = repos_p ? result_pool : scratch_pool; + svn_boolean_t init_svnserve = FALSE; apr_hash_t *fs_config = make_fs_config(opts->fs_type, - opts->server_minor_version, pool); + opts->server_minor_version, + repos_pool); + + if (repos_url && opts->repos_dir && opts->repos_url) + { + name = apr_psprintf(scratch_pool, "%s-%s", opts->prog_name, + svn_dirent_basename(name, NULL)); + + repos_abspath = svn_dirent_join(opts->repos_dir, name, scratch_pool); + + SVN_ERR(svn_dirent_get_absolute(&repos_abspath, repos_abspath, + scratch_pool)); + + SVN_ERR(svn_io_make_dir_recursively(repos_abspath, scratch_pool)); + + *repos_url = svn_path_url_add_component2(opts->repos_url, name, + result_pool); + + if (strstr(opts->repos_url, "svn://")) + init_svnserve = TRUE; + } + else + { + SVN_ERR(svn_dirent_get_absolute(&repos_abspath, name, scratch_pool)); + + if (repos_url) + SVN_ERR(svn_uri_get_file_url_from_dirent(repos_url, repos_abspath, + result_pool)); + } /* If there's already a repository named NAME, delete it. Doing things this way means that repositories stick around after a failure for postmortem analysis, but also that tests can be re-run without cleaning out the repositories created by prior runs. */ - if (apr_stat(&finfo, name, APR_FINFO_TYPE, pool) == APR_SUCCESS) - { - if (finfo.filetype == APR_DIR) - SVN_ERR_W(svn_io_remove_dir2(name, TRUE, NULL, NULL, pool), - apr_psprintf(pool, - "cannot create repos '%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); - } + SVN_ERR(svn_io_remove_dir2(repos_abspath, TRUE, NULL, NULL, scratch_pool)); - SVN_ERR(svn_repos_create(&repos, name, NULL, NULL, NULL, - fs_config, pool)); + SVN_ERR(svn_repos_create(&repos, repos_abspath, NULL, NULL, NULL, + fs_config, repos_pool)); /* Register this repo for cleanup. */ - svn_test_add_dir_cleanup(name); + svn_test_add_dir_cleanup(repos_abspath); - SVN_ERR(maybe_install_fsfs_conf(svn_repos_fs(repos), opts, &must_reopen, - pool)); + SVN_ERR(maybe_install_fs_conf(svn_repos_fs(repos), opts, &must_reopen, + scratch_pool)); if (must_reopen) { - SVN_ERR(svn_repos_open2(&repos, name, NULL, pool)); - svn_fs_set_warning_func(svn_repos_fs(repos), fs_warning_handler, NULL); + SVN_ERR(svn_repos_open3(&repos, repos_abspath, NULL, repos_pool, + scratch_pool)); } - *repos_p = repos; + svn_fs_set_warning_func(svn_repos_fs(repos), fs_warning_handler, NULL); + + if (init_svnserve) + { + const char *cfg; + const char *pwd; + + cfg = svn_dirent_join(repos_abspath, "conf/svnserve.conf", scratch_pool); + SVN_ERR(svn_io_remove_file2(cfg, FALSE, scratch_pool)); + SVN_ERR(svn_io_file_create(cfg, + "[general]\n" + "auth-access = write\n" + "password-db = passwd\n", + scratch_pool)); + + pwd = svn_dirent_join(repos_abspath, "conf/passwd", scratch_pool); + SVN_ERR(svn_io_remove_file2(pwd, FALSE, scratch_pool)); + SVN_ERR(svn_io_file_create(pwd, + "[users]\n" + "jrandom = rayjandom\n" + "jconstant = rayjandom\n", + scratch_pool)); + } + + if (repos_p) + *repos_p = repos; + if (repos_dirent) + *repos_dirent = apr_pstrdup(result_pool, repos_abspath); + return SVN_NO_ERROR; } svn_error_t * +svn_test__create_repos(svn_repos_t **repos_p, + const char *name, + const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + return svn_error_trace( + svn_test__create_repos2(repos_p, NULL, NULL, name, + opts, pool, pool)); +} + +svn_error_t * svn_test__stream_to_string(svn_stringbuf_t **string, svn_stream_t *stream, apr_pool_t *pool) @@ -264,7 +343,7 @@ svn_test__stream_to_string(svn_stringbuf_t **string, do { len = sizeof(buf); - SVN_ERR(svn_stream_read(stream, buf, &len)); + SVN_ERR(svn_stream_read_full(stream, buf, &len)); /* Now copy however many bytes were *actually* read into str. */ svn_stringbuf_appendbytes(str, buf, len); @@ -355,6 +434,8 @@ get_dir_entries(apr_hash_t *tree_entries, } +/* Verify that PATH under ROOT is: a directory if contents is NULL; + a file with contents CONTENTS otherwise. */ static svn_error_t * validate_tree_entry(svn_fs_root_t *root, const char *path, @@ -363,10 +444,19 @@ validate_tree_entry(svn_fs_root_t *root, { svn_stream_t *rstream; svn_stringbuf_t *rstring; - svn_boolean_t is_dir; + svn_node_kind_t kind; + svn_boolean_t is_dir, is_file; - /* Verify that this is the expected type of node */ + /* Verify that node types are reported consistently. */ + SVN_ERR(svn_fs_check_path(&kind, root, path, pool)); SVN_ERR(svn_fs_is_dir(&is_dir, root, path, pool)); + SVN_ERR(svn_fs_is_file(&is_file, root, path, pool)); + + SVN_TEST_ASSERT(!is_dir || kind == svn_node_dir); + SVN_TEST_ASSERT(!is_file || kind == svn_node_file); + SVN_TEST_ASSERT(is_dir || is_file); + + /* Verify that this is the expected type of node */ if ((!is_dir && !contents) || (is_dir && contents)) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, @@ -376,10 +466,17 @@ validate_tree_entry(svn_fs_root_t *root, /* Verify that the contents are as expected (files only) */ if (! is_dir) { + svn_stringbuf_t *expected = svn_stringbuf_create(contents, pool); + + /* File lengths. */ + svn_filesize_t length; + SVN_ERR(svn_fs_file_length(&length, root, path, pool)); + SVN_TEST_ASSERT(expected->len == length); + + /* Text contents. */ SVN_ERR(svn_fs_file_contents(&rstream, root, path, pool)); SVN_ERR(svn_test__stream_to_string(&rstring, rstream, pool)); - if (! svn_stringbuf_compare(rstring, - svn_stringbuf_create(contents, pool))) + if (! svn_stringbuf_compare(rstring, expected)) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, "node '%s' in tree had unexpected contents", @@ -409,6 +506,9 @@ svn_test__validate_tree(svn_fs_root_t *root, apr_hash_index_t *hi; int i; + /* There should be no entry with this name. */ + const char *na_name = "es-vee-en"; + /* Create a hash for storing our expected entries */ expected_entries = apr_hash_make(subpool); @@ -497,6 +597,23 @@ svn_test__validate_tree(svn_fs_root_t *root, svn_stringbuf_appendcstr(extra_entries, "\n"); } + /* Test that non-existent paths will not be found. + * Skip this test if somebody sneakily added NA_NAME. */ + if (!svn_hash_gets(expected_entries, na_name)) + { + svn_node_kind_t kind; + svn_boolean_t is_dir, is_file; + + /* Verify that the node is reported as "n/a". */ + SVN_ERR(svn_fs_check_path(&kind, root, na_name, subpool)); + SVN_ERR(svn_fs_is_dir(&is_dir, root, na_name, subpool)); + SVN_ERR(svn_fs_is_file(&is_file, root, na_name, subpool)); + + SVN_TEST_ASSERT(kind == svn_node_none); + SVN_TEST_ASSERT(!is_file); + SVN_TEST_ASSERT(!is_dir); + } + if (missing_entries || extra_entries || corrupt_entries) { return svn_error_createf @@ -530,23 +647,23 @@ svn_test__validate_changes(svn_fs_root_t *root, { int i; for (i=0, hi = apr_hash_first(pool, expected); hi; hi = apr_hash_next(hi)) - SVN_DBG(("expected[%d] = '%s'\n", i++, svn__apr_hash_index_key(hi))); + SVN_DBG(("expected[%d] = '%s'\n", i++, apr_hash_this_key(hi))); for (i=0, hi = apr_hash_first(pool, actual); hi; hi = apr_hash_next(hi)) - SVN_DBG(("actual[%d] = '%s'\n", i++, svn__apr_hash_index_key(hi))); + SVN_DBG(("actual[%d] = '%s'\n", i++, apr_hash_this_key(hi))); } #endif for (hi = apr_hash_first(pool, expected); hi; hi = apr_hash_next(hi)) - if (NULL == svn_hash_gets(actual, svn__apr_hash_index_key(hi))) + if (NULL == svn_hash_gets(actual, apr_hash_this_key(hi))) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Path '%s' missing from actual changed-paths", - svn__apr_hash_index_key(hi)); + (const char *)apr_hash_this_key(hi)); for (hi = apr_hash_first(pool, actual); hi; hi = apr_hash_next(hi)) - if (NULL == svn_hash_gets(expected, svn__apr_hash_index_key(hi))) + if (NULL == svn_hash_gets(expected, apr_hash_this_key(hi))) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Path '%s' missing from expected changed-paths", - svn__apr_hash_index_key(hi)); + (const char *)apr_hash_this_key(hi)); return SVN_NO_ERROR; } |