[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r978841 - in /subversion/trunk/subversion/tests/cmdline: svnrdump_tests.py svnrdump_tests_data/ svnrdump_tests_data/revision0.dump

From: Ramkumar Ramachandra <artagnon_at_gmail.com>
Date: Sat, 24 Jul 2010 16:58:34 +0530

Hi Daniel,

Daniel Shahaf writes:
> Please don't add "Review by" before I've actually reviewed the patch, thanks :-)

Um, right. I guess I misunderstood you when you asked me to put the
'Review by' in your previous email. I'll include it while actually
committing, but not in the email.

> Perhaps you can use one of the UnexpectedStderr classes? This has the
> advantage that the unexpected stderr output would be printed to whomever is
> running the test.

Excellent suggestion! Now fixed.

[[[
* subversino/tests/cmdline/svnrdump_tests.py (run_test): Run svnrdump
  with '-q' and check that nothing is printed to stderr.
]]]

Index: subversion/tests/cmdline/svnrdump_tests.py
===================================================================
--- subversion/tests/cmdline/svnrdump_tests.py (revision 978841)
+++ subversion/tests/cmdline/svnrdump_tests.py (working copy)
@@ -73,15 +73,15 @@ def run_test(sbox, dumpfile_name):
   svntest.actions.run_and_verify_load(sbox.repo_dir, svnadmin_dumpfile)
 
   # Create a dump file using svnrdump
- r, svnrdump_dumpfile, err = svntest.main.run_svnrdump(sbox.repo_url)
+ r, svnrdump_dumpfile, err = svntest.main.run_svnrdump('-q', sbox.repo_url)
 
   # Check error code
   if (r != 0):
     raise svntest.Failure('Result code not 0')
 
   # Check the output from stderr
- if not err[0].startswith('* Dumped revision'):
- raise svntest.Failure('No valid output')
+ if err:
+ raise SVNUnexpectedStderr(err)
 
   # Compare the output from stdout
   svntest.verify.compare_and_display_lines(
Received on 2010-07-24 13:30:50 CEST

This is an archived mail posted to the Subversion Dev mailing list.