You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/05/03 19:25:03 UTC
svn commit: r940522 -
/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Author: pburba
Date: Mon May 3 17:25:02 2010
New Revision: 940522
URL: http://svn.apache.org/viewvc?rev=940522&view=rev
Log:
Let the svndumpfilter_tests.py tests see the stderr results when running
svndumpfilter in non-quiet mode.
* subversion/tests/cmdline/svndumpfilter_tests.py
(filter_and_return_output): Return stderr.
(reflect_dropped_renumbered_revs,
svndumpfilter_loses_mergeinfo,
_simple_dumpfilter_test,
filter_mergeinfo_revs_outside_of_dump_stream): Update callers of
filter_and_return_output.
Modified:
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=940522&r1=940521&r2=940522&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Mon May 3 17:25:02 2010
@@ -48,16 +48,28 @@ Item = svntest.wc.StateItem
def filter_and_return_output(dump, bufsize=0, *varargs):
- """Filter the array of lines passed in 'dump' and return the output"""
+ """Filter the array of lines passed in 'dump' and return the output
+ and errput"""
if isinstance(dump, str):
dump = [ dump ]
- ## TODO: Should we need to handle errput and exit_code?
+ # Does the caller want the stderr?
+ try:
+ varargs.index('-q')
+ expected_errput = None # Stderr with -q or --quiet is a real error!
+ except:
+ try:
+ varargs.index('--quiet')
+ expected_errput = None
+ except:
+ expected_errput = svntest.verify.AnyOutput
+ ## TODO: Should we handle exit_code?
exit_code, output, errput = svntest.main.run_command_stdin(
- svntest.main.svndumpfilter_binary, None, bufsize, 1, dump, *varargs)
-
- return output
+ svntest.main.svndumpfilter_binary, expected_errput, bufsize, 1,
+ dump, *varargs)
+
+ return output, errput
######################################################################
@@ -76,11 +88,13 @@ def reflect_dropped_renumbered_revs(sbox
'with_merges.dump')
dumpfile = open(dumpfile_location).read()
- filtered_out = filter_and_return_output(dumpfile, 0, "include",
- "trunk", "branch1",
- "--skip-missing-merge-sources",
- "--drop-empty-revs",
- "--renumber-revs", "--quiet")
+ filtered_out, filtered_err = filter_and_return_output(
+ dumpfile, 0, "include",
+ "trunk", "branch1",
+ "--skip-missing-merge-sources",
+ "--drop-empty-revs",
+ "--renumber-revs", "--quiet")
+
load_and_verify_dumpstream(sbox, [], [], None, filtered_out,
"--ignore-uuid")
@@ -96,11 +110,12 @@ def reflect_dropped_renumbered_revs(sbox
# Test svndumpfilter with exclude option
test_create(sbox)
- filtered_out = filter_and_return_output(dumpfile, 0, "exclude",
- "branch1",
- "--skip-missing-merge-sources",
- "--drop-empty-revs",
- "--renumber-revs", "--quiet")
+ filtered_out, filtered_err = filter_and_return_output(
+ dumpfile, 0, "exclude", "branch1",
+ "--skip-missing-merge-sources",
+ "--drop-empty-revs",
+ "--renumber-revs", "--quiet")
+
load_and_verify_dumpstream(sbox, [], [], None, filtered_out,
"--ignore-uuid")
@@ -124,8 +139,9 @@ def svndumpfilter_loses_mergeinfo(sbox):
'with_merges.dump')
dumpfile = open(dumpfile_location).read()
- filtered_out = filter_and_return_output(dumpfile, 0, "include",
- "trunk", "branch1", "--quiet")
+ filtered_out, filtered_err = filter_and_return_output(dumpfile, 0, "include",
+ "trunk", "branch1",
+ "--quiet")
load_and_verify_dumpstream(sbox, [], [], None, filtered_out)
# Verify the svn:mergeinfo properties
@@ -141,8 +157,9 @@ def svndumpfilter_loses_mergeinfo(sbox):
def _simple_dumpfilter_test(sbox, dumpfile, *dumpargs):
wc_dir = sbox.wc_dir
- filtered_output = filter_and_return_output(dumpfile, 0,
- '--quiet', *dumpargs)
+ filtered_output, filtered_err = filter_and_return_output(dumpfile, 0,
+ '--quiet',
+ *dumpargs)
# Setup our expectations
load_and_verify_dumpstream(sbox, [], [], None, filtered_output,
@@ -310,13 +327,12 @@ def filter_mergeinfo_revs_outside_of_dum
'svndumpfilter_tests_data',
'mergeinfo_included_partial.dump')
partial_dump_contents = open(partial_dump).read()
- filtered_dumpfile2 = filter_and_return_output(partial_dump_contents,
- 8192, # Set a sufficiently
- # large bufsize to
- # avoid a deadlock
- "include", "trunk", "branches",
- "--skip-missing-merge-sources",
- "--quiet")
+ filtered_dumpfile2, filtered_out = filter_and_return_output(
+ partial_dump_contents,
+ 8192, # Set a sufficiently large bufsize to avoid a deadlock
+ "include", "trunk", "branches",
+ "--skip-missing-merge-sources",
+ "--quiet")
load_and_verify_dumpstream(sbox, [], [], None, filtered_dumpfile2,
'--ignore-uuid')
# Check the resulting mergeinfo.