You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/11/23 02:05:27 UTC
svn commit: r1544726 - in /subversion/trunk/subversion/tests:
libsvn_client/client-test.c libsvn_fs_base/changes-test.c
libsvn_fs_base/strings-reps-test.c libsvn_subr/translate-test.c
libsvn_wc/op-depth-test.c
Author: stefan2
Date: Sat Nov 23 01:05:26 2013
New Revision: 1544726
URL: http://svn.apache.org/r1544726
Log:
All our tests should use separate working sets. This patch fixes
a bunch of C tests that used the same files / folders as other tests.
Most of them were probably the result of copy'n'paste.
* subversion/tests/libsvn_client/client-test.c
(test_foreign_repos_copy): use test-specific working set
* subversion/tests/libsvn_fs_base/changes-test.c
(changes_fetch_raw): ditto
* subversion/tests/libsvn_fs_base/strings-reps-test.c
(write_null_string): ditto
* subversion/tests/libsvn_subr/translate-test.c
(mixed_to_lf,
unexpand_author,
unexpand_date,
unexpand_author_date,
unexpand_author_rev,
unexpand_rev,
unexpand_rev_url,
unexpand_author_date_rev_url,
lf_to_crlf_unexpand_author,
mixed_to_lf_unexpand_author_date,
crlf_to_cr_unexpand_author_rev,
cr_to_crlf_unexpand_rev,
cr_to_crlf_unexpand_rev_url): ditto
* subversion/tests/libsvn_wc/op-depth-test.c
(test_adds_change_kind,
movedto_opdepth,
del4_update_edit_AAA,
del4_update_delete_AAA,
del4_update_add_AAA,
del4_update_delself_AAA): ditto
Modified:
subversion/trunk/subversion/tests/libsvn_client/client-test.c
subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c
subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
subversion/trunk/subversion/tests/libsvn_subr/translate-test.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-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=1544726&r1=1544725&r2=1544726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Sat Nov 23 01:05:26 2013
@@ -735,7 +735,7 @@ test_foreign_repos_copy(const svn_test_o
SVN_ERR(create_greek_repos(&repos_url, "foreign-copy1", opts, pool));
SVN_ERR(create_greek_repos(&repos2_url, "foreign-copy2", opts, pool));
- wc_path = svn_test_data_path("test-wc-add", pool);
+ wc_path = svn_test_data_path("test-foreign-repos-copy", pool);
wc_path = svn_dirent_join(wc_path, "foreign-wc", pool);
Modified: subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c?rev=1544726&r1=1544725&r2=1544726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c Sat Nov 23 01:05:26 2013
@@ -193,7 +193,7 @@ changes_fetch_raw(const svn_test_opts_t
struct changes_args args;
/* Create a new fs and repos */
- SVN_ERR(svn_test__create_bdb_fs(&fs, "test-repo-changes-fetch", opts,
+ SVN_ERR(svn_test__create_bdb_fs(&fs, "test-repo-changes-fetch-raw", opts,
pool));
/* First, verify that we can request changes for an arbitrary key
Modified: subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c?rev=1544726&r1=1544725&r2=1544726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c Sat Nov 23 01:05:26 2013
@@ -612,7 +612,7 @@ write_null_string(const svn_test_opts_t
/* Create a new fs and repos */
SVN_ERR(svn_test__create_bdb_fs
- (&fs, "test-repo-test-strings", opts,
+ (&fs, "test-repo-write-null-string", opts,
pool));
args.fs = fs;
Modified: subversion/trunk/subversion/tests/libsvn_subr/translate-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/translate-test.c?rev=1544726&r1=1544725&r2=1544726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/translate-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/translate-test.c Sat Nov 23 01:05:26 2013
@@ -862,7 +862,7 @@ static svn_error_t *
mixed_to_lf(apr_pool_t *pool)
{
return substitute_and_verify
- ("cr_to_lf", NULL, "\n", 1, NULL, NULL, NULL, NULL, 1, pool);
+ ("mixed_to_lf", NULL, "\n", 1, NULL, NULL, NULL, NULL, 1, pool);
}
@@ -1096,10 +1096,10 @@ static svn_error_t *
unexpand_author(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("author", "\n", NULL, 0, NULL, NULL, "jrandom", NULL, 0, pool));
+ ("unexpand_author", "\n", NULL, 0, NULL, NULL, "jrandom", NULL, 0, pool));
SVN_ERR(substitute_and_verify
- ("author", "\r\n", NULL, 0, NULL, NULL, "jrandom", NULL, 0, pool));
+ ("unexpand_author", "\r\n", NULL, 0, NULL, NULL, "jrandom", NULL, 0, pool));
return SVN_NO_ERROR;
}
@@ -1109,11 +1109,11 @@ static svn_error_t *
unexpand_date(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("date", "\n", NULL, 0,
+ ("unexpand_date", "\n", NULL, 0,
NULL, "Wed Jan 9 07:49:05 2002", NULL, NULL, 0, pool));
SVN_ERR(substitute_and_verify
- ("date", "\r\n", NULL, 0,
+ ("unexpand_date", "\r\n", NULL, 0,
NULL, "Wed Jan 9 07:49:05 2002", NULL, NULL, 0, pool));
return SVN_NO_ERROR;
@@ -1124,11 +1124,11 @@ static svn_error_t *
unexpand_author_date(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("author_date", "\n", NULL, 0,
+ ("unexpand_author_date", "\n", NULL, 0,
NULL, "Wed Jan 9 07:49:05 2002", "jrandom", NULL, 0, pool));
SVN_ERR(substitute_and_verify
- ("author_date", "\r\n", NULL, 0,
+ ("unexpand_author_date", "\r\n", NULL, 0,
NULL, "Wed Jan 9 07:49:05 2002", "jrandom", NULL, 0, pool));
return SVN_NO_ERROR;
@@ -1139,11 +1139,11 @@ static svn_error_t *
unexpand_author_rev(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("author_rev", "\n", NULL, 0,
+ ("unexpand_author_rev", "\n", NULL, 0,
"1729", NULL, "jrandom", NULL, 0, pool));
SVN_ERR(substitute_and_verify
- ("author_rev", "\r\n", NULL, 0,
+ ("unexpand_author_rev", "\r\n", NULL, 0,
"1729", NULL, "jrandom", NULL, 0, pool));
return SVN_NO_ERROR;
@@ -1154,11 +1154,11 @@ static svn_error_t *
unexpand_rev(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("rev", "\n", NULL, 0,
+ ("unexpand_rev", "\n", NULL, 0,
"1729", NULL, NULL, NULL, 0, pool));
SVN_ERR(substitute_and_verify
- ("rev", "\r\n", NULL, 0,
+ ("unexpand_rev", "\r\n", NULL, 0,
"1729", NULL, NULL, NULL, 0, pool));
return SVN_NO_ERROR;
@@ -1169,11 +1169,11 @@ static svn_error_t *
unexpand_rev_url(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("rev_url", "\n", NULL, 0,
+ ("unexpand_rev_url", "\n", NULL, 0,
"1729", NULL, NULL, "http://subversion.tigris.org", 0, pool));
SVN_ERR(substitute_and_verify
- ("rev_url", "\r\n", NULL, 0,
+ ("unexpand_rev_url", "\r\n", NULL, 0,
"1729", NULL, NULL, "http://subversion.tigris.org", 0, pool));
return SVN_NO_ERROR;
@@ -1184,7 +1184,7 @@ static svn_error_t *
unexpand_author_date_rev_url(apr_pool_t *pool)
{
SVN_ERR(substitute_and_verify
- ("author_date_rev_url", "\n", NULL, 0,
+ ("unexpand_author_date_rev_url", "\n", NULL, 0,
"1729",
"Wed Jan 9 07:49:05 2002",
"jrandom",
@@ -1192,7 +1192,7 @@ unexpand_author_date_rev_url(apr_pool_t
1, pool));
SVN_ERR(substitute_and_verify
- ("author_date_rev_url", "\r\n", NULL, 0,
+ ("unexpand_author_date_rev_url", "\r\n", NULL, 0,
"1729",
"Wed Jan 9 07:49:05 2002",
"jrandom",
@@ -1210,7 +1210,7 @@ static svn_error_t *
lf_to_crlf_unexpand_author(apr_pool_t *pool)
{
return substitute_and_verify
- ("lf_to_crlf_author", "\n", "\r\n", 0,
+ ("lf_to_crlf_unexpand_author", "\n", "\r\n", 0,
NULL, NULL, "jrandom", NULL, 0, pool);
}
@@ -1219,7 +1219,7 @@ static svn_error_t *
mixed_to_lf_unexpand_author_date(apr_pool_t *pool)
{
return substitute_and_verify
- ("mixed_to_lf_author_date", NULL, "\n", 1,
+ ("mixed_to_lf_unexpand_author_date", NULL, "\n", 1,
NULL, "Wed Jan 9 07:49:05 2002", "jrandom", NULL, 0, pool);
}
@@ -1228,7 +1228,7 @@ static svn_error_t *
crlf_to_cr_unexpand_author_rev(apr_pool_t *pool)
{
return substitute_and_verify
- ("crlf_to_cr_author_rev", "\r\n", "\r", 0,
+ ("crlf_to_cr_unexpand_author_rev", "\r\n", "\r", 0,
"1729", NULL, "jrandom", NULL, 0, pool);
}
@@ -1237,7 +1237,7 @@ static svn_error_t *
cr_to_crlf_unexpand_rev(apr_pool_t *pool)
{
return substitute_and_verify
- ("cr_to_crlf_rev", "\r", "\r\n", 0,
+ ("cr_to_crlf_unexpand_rev", "\r", "\r\n", 0,
"1729", NULL, NULL, NULL, 0, pool);
}
@@ -1246,7 +1246,7 @@ static svn_error_t *
cr_to_crlf_unexpand_rev_url(apr_pool_t *pool)
{
return substitute_and_verify
- ("cr_to_crlf_rev_url", "\r", "\r\n", 0,
+ ("cr_to_crlf_unexpand_rev_url", "\r", "\r\n", 0,
"1729", NULL, NULL, "http://subversion.tigris.org", 0, pool);
}
@@ -1255,7 +1255,7 @@ static svn_error_t *
mixed_to_crlf_unexpand_author_date_rev_url(apr_pool_t *pool)
{
return substitute_and_verify
- ("mixed_to_crlf_author_date_rev_url", NULL, "\r\n", 1,
+ ("mixed_to_crlf_unexpand_author_date_rev_url", NULL, "\r\n", 1,
"1729",
"Wed Jan 9 07:49:05 2002",
"jrandom",
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1544726&r1=1544725&r2=1544726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Sat Nov 23 01:05:26 2013
@@ -904,7 +904,7 @@ test_adds_change_kind(const svn_test_opt
{
svn_test__sandbox_t b;
- SVN_ERR(svn_test__sandbox_create(&b, "adds", opts, pool));
+ SVN_ERR(svn_test__sandbox_create(&b, "test_adds_change_kind", opts, pool));
SVN_ERR(sbox_add_and_commit_greek_tree(&b));
/* replace dir with file */
@@ -7249,7 +7249,7 @@ movedto_opdepth(const svn_test_opts_t *o
{
svn_test__sandbox_t b;
- SVN_ERR(svn_test__sandbox_create(&b, "moved_to_op_depth",
+ SVN_ERR(svn_test__sandbox_create(&b, "movedto_opdepth",
opts, pool));
SVN_ERR(sbox_wc_mkdir(&b, "A"));
@@ -9015,7 +9015,7 @@ del4_update_edit_AAA(const svn_test_opts
{
svn_test__sandbox_t b;
- SVN_ERR(init_move4(&b, "move4_update_edit_AAA", opts, FALSE, pool));
+ SVN_ERR(init_move4(&b, "del4_update_edit_AAA", opts, FALSE, pool));
/* Update and resolve via mine strategy */
SVN_ERR(sbox_wc_update(&b, "", 2));
@@ -9035,7 +9035,7 @@ del4_update_delete_AAA(const svn_test_op
{
svn_test__sandbox_t b;
- SVN_ERR(init_move4(&b, "move4_update_delete_AAA", opts, FALSE, pool));
+ SVN_ERR(init_move4(&b, "del4_update_delete_AAA", opts, FALSE, pool));
/* Update and resolve via mine strategy */
SVN_ERR(sbox_wc_update(&b, "", 2));
@@ -9055,7 +9055,7 @@ del4_update_add_AAA(const svn_test_opts_
{
svn_test__sandbox_t b;
- SVN_ERR(init_move4(&b, "move4_update_add_AAA", opts, FALSE, pool));
+ SVN_ERR(init_move4(&b, "del4_update_add_AAA", opts, FALSE, pool));
/* Update and resolve via mine strategy */
SVN_ERR(sbox_wc_update(&b, "", 2));
@@ -9075,7 +9075,7 @@ del4_update_delself_AAA(const svn_test_o
{
svn_test__sandbox_t b;
- SVN_ERR(init_move4(&b, "move4_update_delself_AAA", opts, FALSE, pool));
+ SVN_ERR(init_move4(&b, "del4_update_delself_AAA", opts, FALSE, pool));
/* Update and resolve via mine strategy */
SVN_ERR(sbox_wc_update(&b, "", 2));