svn commit: r979268 - in /subversion/trunk/subversion/tests/cmdline: svnrdump_tests.py svntest/actions.py

[rh...@apache.org]

Author: rhuijben
Date: Mon Jul 26 13:09:10 2010
New Revision: 979268

URL: http://svn.apache.org/viewvc?rev=979268&view=rev
Log:
Fix the svnrdump test failures by extending run_and_verify_svnrdump()
to accept varargs and passing the dump command.

* subversion/tests/cmdline/svnrdump_tests.py
  (build_repos, basic_svnrdump): Pass 'dump' command.

* subversion/tests/cmdline/svntest/actions.py
  (run_and_verify_svnrdump): Accept varargs instead of just a url.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/actions.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=979268&r1=979267&r2=979268&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Mon Jul 26 13:09:10 2010
@@ -73,7 +73,7 @@ def run_test(sbox, dumpfile_name):
   svntest.actions.run_and_verify_load(sbox.repo_dir, svnadmin_dumpfile)
 
   # Create a dump file using svnrdump
-  svnrdump_dumpfile = svntest.actions.run_and_verify_svnrdump(sbox.repo_url)
+  svnrdump_dumpfile = svntest.actions.run_and_verify_svnrdump('dump', sbox.repo_url)
 
   # Compare the output from stdout
   svntest.verify.compare_and_display_lines(
@@ -86,7 +86,7 @@ def basic_svnrdump(sbox):
   "dump the standard sbox repos"
   sbox.build(read_only = True, create_wc = False)
 
-  out = svntest.actions.run_and_verify_svnrdump(sbox.repo_url)
+  out = svntest.actions.run_and_verify_svnrdump('dump', sbox.repo_url)
 
   if not out[0].startswith('SVN-fs-dump-format-version:'):
     raise svntest.Failure('No valid output')

Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=979268&r1=979267&r2=979268&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Mon Jul 26 13:09:10 2010
@@ -284,9 +284,9 @@ def run_and_verify_dump(repo_dir):
   return output
 
 
-def run_and_verify_svnrdump(repo_dir):
+def run_and_verify_svnrdump(*varargs):
   "Runs 'svnadmin dump' and reports any errors, returning the dump content."
-  exit_code, output, errput = main.run_svnrdump('-q', repo_dir)
+  exit_code, output, errput = main.run_svnrdump('-q', *varargs)
 
   if exit_code != 0:
     raise svntest.Failure("Exit code not 0")