Author: danielsh
Date: Tue Jan 25 09:59:40 2022
New Revision: 1897443
URL: http://svn.apache.org/viewvc?rev=1897443&view=rev
Log:
Stop encoding a test's number in the svntest library.
* subversion/tests/cmdline/svntest/main.py
(run_command_stdin): Stop hardcoding an exception for "prop_tests-12".
* subversion/tests/cmdline/svntest/actions.py
(disable_revprop_changes): Stop emitting pre-revprop-change's argv[1].
This function is only used by prop_tests.py 12 revprop_change(), and that
function doesn't care about the value of argv[1].
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1897443&r1=1897442&r2=1897443&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Tue Jan 25
09:59:40 2022
@@ -2134,9 +2134,10 @@ def disable_revprop_changes(repo_dir):
main.create_python_hook_script(hook_path,
'import sys\n'
'sys.stderr.write("pre-revprop-change %s" %'
- ' " ".join(sys.argv[1:]))\n'
+ ' " ".join(sys.argv[2:]))\n'
'sys.exit(1)\n',
cmd_alternative=
+ '@shift\n'
'@echo pre-revprop-change %* 1>&2\n'
'@exit 1\n')
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1897443&r1=1897442&r2=1897443&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Jan 25
09:59:40 2022
@@ -637,8 +637,7 @@ def run_command_stdin(command, error_exp
break
# Does the server leak the repository on-disk path?
# (prop_tests-12 installs a hook script that does that intentionally)
- if any(map(_line_contains_repos_diskpath, lines)) \
- and not any(map(lambda arg: 'prop_tests-12' in arg, varargs)):
+ if any(map(_line_contains_repos_diskpath, lines)):
raise Failure("Repository diskpath in %s: %r" % (name, lines))
valgrind_diagnostic = False
