Author: cmpilato
Date: Fri May 27 15:24:15 2011
New Revision: 1128360
URL: http://svn.apache.org/viewvc?rev=1128360&view=rev
Log:
This is a followup to r1128340 which fixes all the svnrdump_tests.py
tests I broke therein.
* subversion/tests/cmdline/svnrdump_tests.py
(run_load_test, reflect_dropped_renumbered_revs,
dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads,
svnrdump_load_partial_incremental_dump): Don't pass '-q' when we're
explicitly testing that we got some output.
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=1128360&r1=1128359&r2=1128360&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri May 27
15:24:15 2011
@@ -144,8 +144,7 @@ def run_load_test(sbox, dumpfile_name, e
svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
# Create a dump file using svnadmin dump
svnadmin_dumpfile = svntest.actions.run_and_verify_dump(sbox.repo_dir,
@@ -381,8 +380,7 @@ def reflect_dropped_renumbered_revs(sbox
# svnrdump load the dump file.
svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
# Create the 'toplevel' directory in repository and then load the same
# dumpfile into that subtree.
@@ -391,7 +389,7 @@ def reflect_dropped_renumbered_revs(sbox
"-m", "Create toplevel dir to load into")
svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
+ [], 0, 'load',
sbox.repo_url + "/toplevel")
# Verify the svn:mergeinfo properties
url = sbox.repo_url
@@ -488,8 +486,7 @@ def dont_drop_valid_mergeinfo_during_inc
svntest.actions.run_and_verify_svnrdump(dumpfile_full,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
# Check that the mergeinfo is as expected.
url = sbox.repo_url + '/branches/'
@@ -545,20 +542,17 @@ def dont_drop_valid_mergeinfo_during_inc
dump_fp = open(dump_file_r1_10, 'rb')
svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(),
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
dump_fp.close()
dump_fp = open(dump_file_r11_13, 'rb')
svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(),
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
dump_fp.close()
dump_fp = open(dump_file_r14_15, 'rb')
svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(),
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
dump_fp.close()
# Check the mergeinfo, we use the same expected output as before,
@@ -596,13 +590,12 @@ def dont_drop_valid_mergeinfo_during_inc
dump_fp.close()
svntest.actions.run_and_verify_svnrdump(dumpfile_skeleton,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
# Load 'svnadmin_tests_data/mergeinfo_included_full.dump' in one shot:
svntest.actions.run_and_verify_svnrdump(dumpfile_full,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
+ [], 0, 'load',
sbox.repo_url +
'/Projects/Project-X')
# Check that the mergeinfo is as expected. This is exactly the
@@ -644,8 +637,7 @@ def dont_drop_valid_mergeinfo_during_inc
# Load the skeleton repos into the empty target:
svntest.actions.run_and_verify_svnrdump(dumpfile_skeleton,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
# Load the three incremental dump files in sequence.
#
@@ -653,19 +645,19 @@ def dont_drop_valid_mergeinfo_during_inc
dump_fp = open(dump_file_r1_10, 'rb')
svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(),
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
+ [], 0, 'load',
sbox.repo_url +
'/Projects/Project-X')
dump_fp.close()
dump_fp = open(dump_file_r11_13, 'rb')
svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(),
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
+ [], 0, 'load',
sbox.repo_url +
'/Projects/Project-X')
dump_fp.close()
dump_fp = open(dump_file_r14_15, 'rb')
svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(),
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
+ [], 0, 'load',
sbox.repo_url +
'/Projects/Project-X')
dump_fp.close()
@@ -703,8 +695,7 @@ def svnrdump_load_partial_incremental_du
dump_file.close()
svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile,
svntest.verify.AnyOutput,
- [], 0, '-q', 'load',
- sbox.repo_url)
+ [], 0, 'load', sbox.repo_url)
########################################################################
# Run the tests
