You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sb...@apache.org on 2012/06/25 22:28:59 UTC
svn commit: r1353728 - in /subversion/trunk/subversion/tests/cmdline:
svnadmin_tests.py svndumpfilter_tests.py
Author: sbutler
Date: Mon Jun 25 20:28:58 2012
New Revision: 1353728
URL: http://svn.apache.org/viewvc?rev=1353728&view=rev
Log:
Simplify some tests that load dump text without verifying.
* subversion/tests/cmdline/svnadmin_tests.py
(load_dumpstream): New helper function.
(load_with_parent_dir,
reflect_dropped_renumbered_revs,
dont_drop_valid_mergeinfo_during_incremental_loads,
load_ranges): Use the new function.
* subversion/tests/cmdine/svndumpfilter_tests.py
(reflect_dropped_renumbered_revs,
svndumpfilter_loses_mergeinfo,
_simple_dumpfilter_test,
filter_mergeinfo_revs_outside_of_dump_stream,
dropped_but_not_renumbered_empty_revs,
match_empty_prefix): Use the new function.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1353728&r1=1353727&r2=1353728&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Jun 25 20:28:58 2012
@@ -232,6 +232,10 @@ def load_and_verify_dumpstream(sbox, exp
svntest.verify.display_trees(None, 'WC TREE', wc_tree, rev_tree)
raise
+def load_dumpstream(sbox, dump, *varargs):
+ "Load dump text without verification."
+ return load_and_verify_dumpstream(sbox, None, None, None, dump,
+ *varargs)
######################################################################
# Tests
@@ -808,8 +812,7 @@ def load_with_parent_dir(sbox):
['\n', 'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/sample",
"-m", "Create sample dir")
- load_and_verify_dumpstream(sbox, [], [], None, dumpfile, '--parent-dir',
- '/sample')
+ load_dumpstream(sbox, dumpfile, '--parent-dir', '/sample')
# Verify the svn:mergeinfo properties for '--parent-dir'
svntest.actions.run_and_verify_svn(None,
@@ -831,8 +834,7 @@ def load_with_parent_dir(sbox):
['\n', 'Committed revision 11.\n'],
[], "mkdir", sbox.repo_url + "/sample-2",
"-m", "Create sample-2 dir")
- load_and_verify_dumpstream(sbox, [], [], None, dumpfile, '--parent-dir',
- 'sample-2')
+ load_dumpstream(sbox, dumpfile, '--parent-dir', 'sample-2')
# Verify the svn:mergeinfo properties for '--parent-dir'.
svntest.actions.run_and_verify_svn(None,
@@ -1142,7 +1144,7 @@ def dont_drop_valid_mergeinfo_during_inc
dumpfile_full = open(os.path.join(os.path.dirname(sys.argv[0]),
'svnadmin_tests_data',
'mergeinfo_included_full.dump')).read()
- load_and_verify_dumpstream(sbox, [], [], None, dumpfile_full, '--ignore-uuid')
+ load_dumpstream(sbox, dumpfile_full, '--ignore-uuid')
# Check that the mergeinfo is as expected.
url = sbox.repo_url + '/branches/'
@@ -1184,15 +1186,9 @@ def dont_drop_valid_mergeinfo_during_inc
test_create(sbox)
# Load the three incremental dump files in sequence.
- load_and_verify_dumpstream(sbox, [], [], None,
- open(dump_file_r1_10).read(),
- '--ignore-uuid')
- load_and_verify_dumpstream(sbox, [], [], None,
- open(dump_file_r11_13).read(),
- '--ignore-uuid')
- load_and_verify_dumpstream(sbox, [], [], None,
- open(dump_file_r14_15).read(),
- '--ignore-uuid')
+ load_dumpstream(sbox, open(dump_file_r1_10).read(), '--ignore-uuid')
+ load_dumpstream(sbox, open(dump_file_r11_13).read(), '--ignore-uuid')
+ load_dumpstream(sbox, open(dump_file_r14_15).read(), '--ignore-uuid')
# Check the mergeinfo, we use the same expected output as before,
# as it (duh!) should be exactly the same as when we loaded the
@@ -1221,13 +1217,11 @@ def dont_drop_valid_mergeinfo_during_inc
dumpfile_skeleton = open(os.path.join(os.path.dirname(sys.argv[0]),
'svnadmin_tests_data',
'skeleton_repos.dump')).read()
- load_and_verify_dumpstream(sbox, [], [], None, dumpfile_skeleton,
- '--ignore-uuid')
+ load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid')
# Load 'svnadmin_tests_data/mergeinfo_included_full.dump' in one shot:
- load_and_verify_dumpstream(sbox, [], [], None, dumpfile_full,
- '--parent-dir', 'Projects/Project-X',
- '--ignore-uuid')
+ load_dumpstream(sbox, dumpfile_full, '--parent-dir', 'Projects/Project-X',
+ '--ignore-uuid')
# Check that the mergeinfo is as expected. This is exactly the
# same expected mergeinfo we previously checked, except that the
@@ -1263,22 +1257,15 @@ def dont_drop_valid_mergeinfo_during_inc
test_create(sbox)
# Load this skeleton repos into the empty target:
- load_and_verify_dumpstream(sbox, [], [], None, dumpfile_skeleton,
- '--ignore-uuid')
+ load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid')
# Load the three incremental dump files in sequence.
- load_and_verify_dumpstream(sbox, [], [], None,
- open(dump_file_r1_10).read(),
- '--parent-dir', 'Projects/Project-X',
- '--ignore-uuid')
- load_and_verify_dumpstream(sbox, [], [], None,
- open(dump_file_r11_13).read(),
- '--parent-dir', 'Projects/Project-X',
- '--ignore-uuid')
- load_and_verify_dumpstream(sbox, [], [], None,
- open(dump_file_r14_15).read(),
- '--parent-dir', 'Projects/Project-X',
- '--ignore-uuid')
+ load_dumpstream(sbox, open(dump_file_r1_10).read(),
+ '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
+ load_dumpstream(sbox, open(dump_file_r11_13).read(),
+ '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
+ load_dumpstream(sbox, open(dump_file_r14_15).read(),
+ '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
# Check the resulting mergeinfo. We expect the exact same results
# as Part 3.
@@ -1590,13 +1577,13 @@ def load_ranges(sbox):
# Load our dumpfile, 2 revisions at a time, verifying that we have
# the correct youngest revision after each load.
- load_and_verify_dumpstream(sbox, [], [], None, dumpdata, '-r0:2')
+ load_dumpstream(sbox, dumpdata, '-r0:2')
svntest.actions.run_and_verify_svnlook("Unexpected output", ['2\n'],
None, 'youngest', sbox.repo_dir)
- load_and_verify_dumpstream(sbox, [], [], None, dumpdata, '-r3:4')
+ load_dumpstream(sbox, dumpdata, '-r3:4')
svntest.actions.run_and_verify_svnlook("Unexpected output", ['4\n'],
None, 'youngest', sbox.repo_dir)
- load_and_verify_dumpstream(sbox, [], [], None, dumpdata, '-r5:6')
+ load_dumpstream(sbox, dumpdata, '-r5:6')
svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'],
None, 'youngest', sbox.repo_dir)
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1353728&r1=1353727&r2=1353728&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Mon Jun 25 20:28:58 2012
@@ -34,7 +34,8 @@ import svntest
from svntest.verify import SVNExpectedStdout, SVNExpectedStderr
# Get some helper routines
-from svnadmin_tests import load_and_verify_dumpstream, test_create
+from svnadmin_tests import (load_and_verify_dumpstream, load_dumpstream,
+ test_create)
from svntest.main import run_svn, run_svnadmin
# (abbreviation)
@@ -104,8 +105,7 @@ def reflect_dropped_renumbered_revs(sbox
"--drop-empty-revs",
"--renumber-revs", "--quiet")
- load_and_verify_dumpstream(sbox, [], [], None, filtered_out,
- "--ignore-uuid")
+ load_dumpstream(sbox, filtered_out, "--ignore-uuid")
# Verify the svn:mergeinfo properties
url = sbox.repo_url
@@ -125,8 +125,7 @@ def reflect_dropped_renumbered_revs(sbox
"--drop-empty-revs",
"--renumber-revs", "--quiet")
- load_and_verify_dumpstream(sbox, [], [], None, filtered_out,
- "--ignore-uuid")
+ load_dumpstream(sbox, filtered_out, "--ignore-uuid")
# Verify the svn:mergeinfo properties
expected_output = svntest.verify.UnorderedOutput([
@@ -152,7 +151,7 @@ def svndumpfilter_loses_mergeinfo(sbox):
filtered_out, filtered_err = filter_and_return_output(dumpfile, 0, "include",
"trunk", "branch1",
"--quiet")
- load_and_verify_dumpstream(sbox, [], [], None, filtered_out)
+ load_dumpstream(sbox, filtered_out)
# Verify the svn:mergeinfo properties
url = sbox.repo_url
@@ -175,8 +174,7 @@ def _simple_dumpfilter_test(sbox, dumpfi
*dumpargs)
# Setup our expectations
- load_and_verify_dumpstream(sbox, [], [], None, filtered_output,
- '--ignore-uuid')
+ load_dumpstream(sbox, filtered_output, '--ignore-uuid')
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/B/E/alpha')
expected_disk.remove('A/B/E/beta')
@@ -350,8 +348,7 @@ def filter_mergeinfo_revs_outside_of_dum
"include", "trunk", "branches",
"--skip-missing-merge-sources",
"--quiet")
- load_and_verify_dumpstream(sbox, [], [], None, filtered_dumpfile2,
- '--ignore-uuid')
+ load_dumpstream(sbox, filtered_dumpfile2, '--ignore-uuid')
# Check the resulting mergeinfo.
url = sbox.repo_url + "/branches"
expected_output = svntest.verify.UnorderedOutput([
@@ -378,8 +375,7 @@ def filter_mergeinfo_revs_outside_of_dum
skeleton_dumpfile = open(os.path.join(os.path.dirname(sys.argv[0]),
'svnadmin_tests_data',
'skeleton_repos.dump')).read()
- load_and_verify_dumpstream(sbox, [], [], None, skeleton_dumpfile,
- '--ignore-uuid')
+ load_dumpstream(sbox, skeleton_dumpfile, '--ignore-uuid')
partial_dump2 = os.path.join(os.path.dirname(sys.argv[0]),
'svndumpfilter_tests_data',
'mergeinfo_included_partial.dump')
@@ -481,9 +477,8 @@ def filter_mergeinfo_revs_outside_of_dum
# Now actually load the filtered dump into the skeleton repository
# and then check the resulting mergeinfo.
- load_and_verify_dumpstream(sbox, [], [], None, filtered_dumpfile2,
- '--parent-dir', '/Projects/Project-X',
- '--ignore-uuid')
+ load_dumpstream(sbox, filtered_dumpfile2,
+ '--parent-dir', '/Projects/Project-X', '--ignore-uuid')
url = sbox.repo_url + "/Projects/Project-X/branches"
expected_output = svntest.verify.UnorderedOutput([
@@ -569,8 +564,7 @@ def dropped_but_not_renumbered_empty_rev
"--skip-missing-merge-sources", "--drop-empty-revs")
# Now load the filtered dump into an empty repository.
- load_and_verify_dumpstream(sbox, [], [], None, filtered_dumpfile,
- '--ignore-uuid')
+ load_dumpstream(sbox, filtered_dumpfile, '--ignore-uuid')
# The mergeinfo in the newly loaded repos should have no references to the
# dropped branch and the remaining merge source revs should be remapped to
@@ -623,8 +617,7 @@ def match_empty_prefix(sbox):
# Load the filtered dump into a repo and check the result
test_create(sbox)
- load_and_verify_dumpstream(sbox, [], [], None, filtered_output,
- '--ignore-uuid')
+ load_dumpstream(sbox, filtered_output, '--ignore-uuid')
svntest.actions.run_and_verify_update(sbox.wc_dir,
expected_output,
expected_disk,