You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2014/04/07 20:39:16 UTC
svn commit: r1585549 -
/subversion/trunk/subversion/tests/cmdline/commit_tests.py
Author: kotkov
Date: Mon Apr 7 18:39:16 2014
New Revision: 1585549
URL: http://svn.apache.org/r1585549
Log:
Following up on r1583977, tweak the dead transaction checks in our tests.
* subversion/tests/cmdline/commit_tests.py
(failed_commit, start_commit_hook_test): Use run_and_verify_svnadmin()
helper instead of directly comparing OUTPUT and ERRPUT. This makes
the check stricter, because we now also test the exit code and removes
unnecessary boilerplate.
Modified:
subversion/trunk/subversion/tests/cmdline/commit_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1585549&r1=1585548&r2=1585549&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Mon Apr 7 18:39:16 2014
@@ -1394,14 +1394,8 @@ def failed_commit(sbox):
'commit', '-m', 'log', other_wc_dir)
# Now list the txns in the repo. The list should be empty.
- exit_code, output, errput = svntest.main.run_svnadmin('lstxns',
- sbox.repo_dir)
- svntest.verify.compare_and_display_lines(
- "Error running 'svnadmin lstxns'.",
- 'STDERR', [], errput)
- svntest.verify.compare_and_display_lines(
- "Output of 'svnadmin lstxns' is unexpected.",
- 'STDOUT', [], output)
+ svntest.actions.run_and_verify_svnadmin(None, [], [],
+ 'lstxns', sbox.repo_dir)
#----------------------------------------------------------------------
@@ -2546,14 +2540,8 @@ def start_commit_hook_test(sbox):
expected_stderr, actual_stderr)
# Now list the txns in the repo. The list should be empty.
- exit_code, output, errput = svntest.main.run_svnadmin('lstxns',
- sbox.repo_dir)
- svntest.verify.compare_and_display_lines(
- "Error running 'svnadmin lstxns'.",
- 'STDERR', [], errput)
- svntest.verify.compare_and_display_lines(
- "Output of 'svnadmin lstxns' is unexpected.",
- 'STDOUT', [], output)
+ svntest.actions.run_and_verify_svnadmin(None, [], [],
+ 'lstxns', sbox.repo_dir)
#----------------------------------------------------------------------
@Issue(3553)