Hi,
On 2022/02/19 21:27, Daniel Shahaf wrote:
Daniel Shahaf wrote on Tue, Feb 08, 2022 at 11:47:47 +0000:
Jun Omae wrote on Sat, Feb 05, 2022 at 00:28:51 +0900:
After r1897443, prop_tests.py 12 is failing on Windows.
svntest.Failure: Repository diskpath in stderr: [
"svn: E175008: While handling the 'cash-sound' property on
'/svn-test-work/repositories/prop_tests-12/!svn/bln/0':\n",
'svn: E175008: Revprop change blocked by pre-revprop-change hook (exit code 1)
with output:\n',
'pre-revprop-change
D:\\a\\subversion\\subversion\\Release\\subversion\\tests\\cmdline\\svn-test-work\\repositories\\prop_tests-12
0 jrandom cash-sound A\n']
FAIL: prop_tests.py 12: set, get, and delete a revprop change
⋮
I think we could use %2 .. %5 variables instead of %* variable.
⋮
Or we could simply remove `cmd_alternative` parameter.
Thanks, Jun. As I don't have a Windows build environment and we don't have
Windows buildbots either, so I can't debug this myself.
Both of your alternative patches seem reasonable. I like how the latter
removes the need to maintain two separate implementations (.py and .bat)
of identical functionality.
However, at the end of the day, I'll be happy with any solution that
works for Windows-based devs.
Could someone test and commit those Windows-only patches, please?
Ping? Any Windows developer has a minute to test & commit either of the
patches in the grandparent post?
I verified prop_tests.py 12 passed on Windows 10 with Python 3.9 after the
patch.
Also, I tried to run tests with windows-2019 environment on GitHub Actions, and
confirmed the patch.
Before the patch:
https://github.com/jun66j5/subversion/runs/5406933640?check_suite_focus=true#step:7:2986
Summary of test results:
2592 tests PASSED
127 tests SKIPPED
77 tests XFAILED (17 WORK-IN-PROGRESS)
1 test FAILED
After the patch:
https://github.com/jun66j5/subversion/runs/5407731482?check_suite_focus=true#step:7:2985
Summary of test results:
2593 tests PASSED
127 tests SKIPPED
77 tests XFAILED (17 WORK-IN-PROGRESS)
--
Jun Omae <jun6...@gmail.com> (大前 潤)
tests: Follow-up to r1897443, fix prop_tests.py#12 on Windows.
* subversion/tests/cmdline/svntest/actions.py
(disable_revprop_changes): Remove cmd_alternative parameter for hook script.
Index: subversion/tests/cmdline/svntest/actions.py
===================================================================
--- subversion/tests/cmdline/svntest/actions.py (revision 1897880)
+++ subversion/tests/cmdline/svntest/actions.py (working copy)
@@ -2135,11 +2135,7 @@ def disable_revprop_changes(repo_dir):
'import sys\n'
'sys.stderr.write("pre-revprop-change %s" %'
' " ".join(sys.argv[2:]))\n'
- 'sys.exit(1)\n',
- cmd_alternative=
- '@shift\n'
- '@echo pre-revprop-change %* 1>&2\n'
- '@exit 1\n')
+ 'sys.exit(1)\n')
def create_failing_post_commit_hook(repo_dir):
"""Create a post-commit hook script in the repository at REPO_DIR that always
