You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ar...@apache.org on 2010/09/22 15:36:07 UTC
svn commit: r999938 - in /subversion/trunk/subversion/tests/cmdline: ./
svnrdump_tests_data/
Author: artagnon
Date: Wed Sep 22 13:36:07 2010
New Revision: 999938
URL: http://svn.apache.org/viewvc?rev=999938&view=rev
Log:
* subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump: Import
new testdata from svnsync_tests_data after converting the dumpfile
from v2 to v3 for svnrdump.
* subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump:
Import new testdata from svnsync_tests_data after converting the
dumpfile from v2 to v3 for svnrdump.
* subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump:
Import new testdata from svnsync_tests_data after converting the
dumpfile from v2 to v3 for svnrdump.
* subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump:
Import new testdata from svnsync_tests_data after converting the
dumpfile from v2 to v3 for svnrdump.
* subversion/tests/cmdline/svnrdump_tests.py
(run_dump_test): Extend function to accept an optional subdirectory
parameter. Update its docstring.
(only_trunk_dump, only_trunk_A_with_changes_dump): Add a couple of
tests to use the added testdata.
(run_test): Run both tests- mark only_trunk_dump as passing and
only_trunk_A_with_changes_dump as WIP since it fails.
Added:
subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump
subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump
subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump
subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump
Modified:
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=999938&r1=999937&r2=999938&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Wed Sep 22 13:36:07 2010
@@ -65,9 +65,12 @@ def build_repos(sbox):
# Create an empty repository.
svntest.main.create_repos(sbox.repo_dir)
-def run_dump_test(sbox, dumpfile_name, expected_dumpfile_name = None):
+def run_dump_test(sbox, dumpfile_name, expected_dumpfile_name = None,
+ subdir = None):
"""Load a dumpfile using 'svnadmin load', dump it with 'svnrdump
- dump' and check that the same dumpfile is produced"""
+ dump' and check that the same dumpfile is produced or that
+ expected_dumpfile_name is produced if provided. Additionally, the
+ subdir argument appends itself to the URL"""
# Create an empty sanbox repository
build_repos(sbox)
@@ -83,12 +86,16 @@ def run_dump_test(sbox, dumpfile_name, e
'rb').readlines()
svntest.actions.run_and_verify_load(sbox.repo_dir, svnadmin_dumpfile)
+
+ repo_url = sbox.repo_url
+ if subdir:
+ repo_url = repo_url + subdir
# Create a dump file using svnrdump
svnrdump_dumpfile = \
svntest.actions.run_and_verify_svnrdump(None, svntest.verify.AnyOutput,
[], 0, '-q', 'dump',
- sbox.repo_url)
+ repo_url)
if expected_dumpfile_name:
svnadmin_dumpfile = open(os.path.join(svnrdump_tests_dir,
@@ -273,6 +280,16 @@ def copy_revprops_load(sbox):
"load: copy revprops other than svn:*"
run_load_test(sbox, "revprops.dump")
+def only_trunk_dump(sbox):
+ "dump: subdirectory"
+ run_dump_test(sbox, "trunk-only.dump", subdir="/trunk",
+ expected_dumpfile_name="trunk-only.expected.dump")
+
+def only_trunk_A_with_changes_dump(sbox):
+ "dump: subdirectory with changes on root"
+ run_dump_test(sbox, "trunk-A-changes.dump", subdir="/trunk/A",
+ expected_dumpfile_name="trunk-A-changes.expected.dump")
+
def url_encoding_dump(sbox):
"dump: url encoding issues"
run_dump_test(sbox, "url-encoding-bug.dump")
@@ -325,6 +342,8 @@ test_list = [ None,
url_encoding_load,
copy_revprops_dump,
copy_revprops_load,
+ only_trunk_dump,
+ Wimp("TODO", only_trunk_A_with_changes_dump),
no_author_dump,
no_author_load,
move_and_modify_in_the_same_revision_dump,
Added: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump?rev=999938&view=auto
==============================================================================
Files subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump (added) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump Wed Sep 22 13:36:07 2010 differ
Added: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump?rev=999938&view=auto
==============================================================================
Files subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump (added) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump Wed Sep 22 13:36:07 2010 differ
Added: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump?rev=999938&view=auto
==============================================================================
Files subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump (added) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump Wed Sep 22 13:36:07 2010 differ
Added: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump?rev=999938&view=auto
==============================================================================
Files subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump (added) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump Wed Sep 22 13:36:07 2010 differ