You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/07/29 17:29:13 UTC
svn commit: r1614386 - in /subversion/branches/move-tracking-2: ./
subversion/tests/cmdline/svnlook_tests.py
subversion/tests/libsvn_repos/repos-test.c
Author: julianfoad
Date: Tue Jul 29 15:29:13 2014
New Revision: 1614386
URL: http://svn.apache.org/r1614386
Log:
On the 'move-tracking-2' branch: catch up with trunk@1614385.
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/move-tracking-2/subversion/tests/libsvn_repos/repos-test.c
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1614348-1614385
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/svnlook_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnlook_tests.py?rev=1614386&r1=1614385&r2=1614386&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/svnlook_tests.py Tue Jul 29 15:29:13 2014
@@ -713,6 +713,8 @@ fp.close()"""
]
verify_logfile(logfilepath, svntest.verify.UnorderedOutput(expected_data))
+# From r1293375 until fixed in r1303856, 'svnlook changed' and 'svnlook diff'
+# produced no output on a property delete.
def property_delete(sbox):
"property delete"
@@ -724,8 +726,6 @@ def property_delete(sbox):
sbox.simple_propdel('foo', 'A/mu')
sbox.simple_commit()
- # XFail since r1293375, changed and diff produce no output on a
- # property delete
svntest.actions.run_and_verify_svnlook(None, ["_U A/mu\n"], [],
'changed', repo_dir)
Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_repos/repos-test.c?rev=1614386&r1=1614385&r2=1614386&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/move-tracking-2/subversion/tests/libsvn_repos/repos-test.c Tue Jul 29 15:29:13 2014
@@ -3179,6 +3179,25 @@ test_delete_repos(const svn_test_opts_t
return SVN_NO_ERROR;
}
+/* Prepare a commit for the filename_with_control_chars() tests */
+static svn_error_t *
+fwcc_prepare(const svn_delta_editor_t **editor_p,
+ void **edit_baton_p,
+ void **root_baton,
+ svn_repos_t *repos,
+ apr_pool_t *scratch_pool)
+{
+ /* Checks for control characters are implemented in the commit editor,
+ * not in the FS API. */
+ SVN_ERR(svn_repos_get_commit_editor4(editor_p, edit_baton_p, repos,
+ NULL, "file://test", "/",
+ "plato", "test commit",
+ dummy_commit_cb, NULL, NULL, NULL,
+ scratch_pool));
+ SVN_ERR((*editor_p)->open_root(*edit_baton_p, 1, scratch_pool, root_baton));
+ return SVN_NO_ERROR;
+}
+
/* Related to issue 4340, "filenames containing \n corrupt FSFS repositories" */
static svn_error_t *
filename_with_control_chars(const svn_test_opts_t *opts,
@@ -3218,17 +3237,6 @@ filename_with_control_chars(const svn_te
SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
- /* Checks for control characters are implemented in the commit editor,
- * not in the FS API. */
- SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
- SVN_ERR(svn_repos_get_commit_editor4(&editor, &edit_baton, repos,
- txn, "file://test", "/",
- "plato", "test commit",
- dummy_commit_cb, NULL, NULL, NULL,
- pool));
-
- SVN_ERR(editor->open_root(edit_baton, 1, pool, &root_baton));
-
/* Attempt to copy /foo to a bad path P. This should fail. */
i = 0;
do
@@ -3237,8 +3245,13 @@ filename_with_control_chars(const svn_te
if (p == NULL)
break;
svn_pool_clear(subpool);
+
+ SVN_ERR(fwcc_prepare(&editor, &edit_baton, &root_baton, repos, subpool));
err = editor->add_directory(p, root_baton, "/foo", 1, subpool,
&out_baton);
+ if (!err)
+ err = editor->close_edit(edit_baton, subpool);
+ svn_error_clear(editor->abort_edit(edit_baton, subpool));
SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_PATH_SYNTAX);
} while (p);
@@ -3250,8 +3263,13 @@ filename_with_control_chars(const svn_te
if (p == NULL)
break;
svn_pool_clear(subpool);
+
+ SVN_ERR(fwcc_prepare(&editor, &edit_baton, &root_baton, repos, subpool));
err = editor->add_file(p, root_baton, NULL, SVN_INVALID_REVNUM,
subpool, &out_baton);
+ if (!err)
+ err = editor->close_edit(edit_baton, subpool);
+ svn_error_clear(editor->abort_edit(edit_baton, subpool));
SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_PATH_SYNTAX);
} while (p);
@@ -3264,13 +3282,16 @@ filename_with_control_chars(const svn_te
if (p == NULL)
break;
svn_pool_clear(subpool);
+
+ SVN_ERR(fwcc_prepare(&editor, &edit_baton, &root_baton, repos, subpool));
err = editor->add_directory(p, root_baton, NULL, SVN_INVALID_REVNUM,
subpool, &out_baton);
+ if (!err)
+ err = editor->close_edit(edit_baton, subpool);
+ svn_error_clear(editor->abort_edit(edit_baton, subpool));
SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_PATH_SYNTAX);
} while (p);
- SVN_ERR(editor->abort_edit(edit_baton, subpool));
-
return SVN_NO_ERROR;
}