It should record a SKIP in this case, not success. "success" means the
test was executed.
In svntest.main, there are a lot of is_FOO functions. Create one to
detect the presence of svnpatch.py, and use that in a Skip for the
test.
Cheers,
-g
On Wed, Mar 11, 2009 at 11:16, Arfrever Frehtes Taifersar Arahesis
<Arfrever.FTA_at_gmail.com> wrote:
> Author: arfrever
> Date: Wed Mar 11 03:16:55 2009
> New Revision: 36481
>
> Log:
> * subversion/tests/cmdline/svntest/actions.py
> (run_and_verify_patch): Return success if the patch program is missing.
>
> Modified:
> trunk/subversion/tests/cmdline/svntest/actions.py
>
> Modified: trunk/subversion/tests/cmdline/svntest/actions.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svntest/actions.py?pathrev=36481&r1=36480&r2=36481
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svntest/actions.py Wed Mar 11 03:03:08 2009 (r36480)
> +++ trunk/subversion/tests/cmdline/svntest/actions.py Wed Mar 11 03:16:55 2009 (r36481)
> @@ -1013,7 +1013,11 @@ def run_and_verify_patch(dir, patch_path
>
> # Update and make a tree of the output.
> patch_command = patch_command + args
> - exit_code, out, err = main.run_svn(error_re_string, *patch_command)
> + exit_code, out, err = main.run_svn(True, *patch_command)
> +
> + # Return early if the patch program is missing
> + if exit_code == 1 and len(err) >= 4 and err[-1] == "svn: External program is missing\n":
> + return
>
> if error_re_string:
> rm = re.compile(error_re_string)
> @@ -1025,8 +1029,10 @@ def run_and_verify_patch(dir, patch_path
> if not match:
> raise main.SVNUnmatchedError
> elif err:
> - ### we should raise a less generic error here. which?
> - raise Failure(err)
> + print("UNEXPECTED STDERR:")
> + for x in err:
> + sys.stdout.write(x)
> + raise verify.SVNUnexpectedStderr
>
> if dry_run and out != out_dry:
> print("=============================================================")
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1307311
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1307461
Received on 2009-03-11 11:57:38 CET