problems writing a regression test for issue 4647

Hi,

I'm currently trying to put together a regression test for issue #4647
[1] in order to serve as a test/validation for the patch proposed in [2].

I think I got to the point where the test actually does what I want it
to do, but it currently unexpectedly fails with the following output
upon the svn resolve -R --accept base call:

Any idea what I'm doing wrong? (see attached patch file for the code)

Testing Release configuration on local repository.
START: resolve_tests.py
W: Unexpected output
W: EXPECTED STDOUT (unordered):
W: | Resolved conflicted state of 's'
W: | Resolved conflicted state of 'v'
W: | Resolved conflicted state of 'n'
W: | Resolved conflicted state of '-'
W: | Resolved conflicted state of 't'
W: | Resolved conflicted state of 'e'
W: | Resolved conflicted state of 's'
W: | Resolved conflicted state of 't'
W: | Resolved conflicted state of '-'
W: | Resolved conflicted state of 'w'
W: | Resolved conflicted state of 'o'
W: | Resolved conflicted state of 'r'
W: | Resolved conflicted state of 'k'
W: | Resolved conflicted state of '\'
W: | Resolved conflicted state of 'w'
W: | Resolved conflicted state of 'o'
W: | Resolved conflicted state of 'r'
W: | Resolved conflicted state of 'k'
W: | Resolved conflicted state of 'i'
W: | Resolved conflicted state of 'n'
W: | Resolved conflicted state of 'g'
W: | Resolved conflicted state of '_'
W: | Resolved conflicted state of 'c'
W: | Resolved conflicted state of 'o'
W: | Resolved conflicted state of 'p'
W: | Resolved conflicted state of 'i'
W: | Resolved conflicted state of 'e'
W: | Resolved conflicted state of 's'
W: | Resolved conflicted state of '\'
W: | Resolved conflicted state of 'r'
W: | Resolved conflicted state of 'e'
W: | Resolved conflicted state of 's'
W: | Resolved conflicted state of 'o'
W: | Resolved conflicted state of 'l'
W: | Resolved conflicted state of 'v'
W: | Resolved conflicted state of 'e'
W: | Resolved conflicted state of '_'
W: | Resolved conflicted state of 't'
W: | Resolved conflicted state of 'e'
W: | Resolved conflicted state of 's'
W: | Resolved conflicted state of 't'
W: | Resolved conflicted state of 's'
W: | Resolved conflicted state of '-'
W: | Resolved conflicted state of '8'
W: ACTUAL STDOUT:
W: DIFF STDOUT (unordered):
W: | --- EXPECTED STDOUT (unordered)
W: | +++ ACTUAL STDOUT
W: | @@ -1,44 +0,0 @@
W: | -Resolved conflicted state of 's'
W: | -Resolved conflicted state of 'v'
W: | -Resolved conflicted state of 'n'
W: | -Resolved conflicted state of '-'
W: | -Resolved conflicted state of 't'
W: | -Resolved conflicted state of 'e'
W: | -Resolved conflicted state of 's'
W: | -Resolved conflicted state of 't'
W: | -Resolved conflicted state of '-'
W: | -Resolved conflicted state of 'w'
W: | -Resolved conflicted state of 'o'
W: | -Resolved conflicted state of 'r'
W: | -Resolved conflicted state of 'k'
W: | -Resolved conflicted state of '\'
W: | -Resolved conflicted state of 'w'
W: | -Resolved conflicted state of 'o'
W: | -Resolved conflicted state of 'r'
W: | -Resolved conflicted state of 'k'
W: | -Resolved conflicted state of 'i'
W: | -Resolved conflicted state of 'n'
W: | -Resolved conflicted state of 'g'
W: | -Resolved conflicted state of '_'
W: | -Resolved conflicted state of 'c'
W: | -Resolved conflicted state of 'o'
W: | -Resolved conflicted state of 'p'
W: | -Resolved conflicted state of 'i'
W: | -Resolved conflicted state of 'e'
W: | -Resolved conflicted state of 's'
W: | -Resolved conflicted state of '\'
W: | -Resolved conflicted state of 'r'
W: | -Resolved conflicted state of 'e'
W: | -Resolved conflicted state of 's'
W: | -Resolved conflicted state of 'o'
W: | -Resolved conflicted state of 'l'
W: | -Resolved conflicted state of 'v'
W: | -Resolved conflicted state of 'e'
W: | -Resolved conflicted state of '_'
W: | -Resolved conflicted state of 't'
W: | -Resolved conflicted state of 'e'
W: | -Resolved conflicted state of 's'
W: | -Resolved conflicted state of 't'
W: | -Resolved conflicted state of 's'
W: | -Resolved conflicted state of '-'
W: | -Resolved conflicted state of '8'
W: CWD: G:\Projekte\MaxSVN\trunk\Release\subversion\tests\cmdline
W: EXCEPTION: SVNLineUnequal
Traceback (most recent call last):
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\main.py",
line 1852, in run
    rc = self.pred.run(sandbox)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\testcase.py",
line 178, in run
    result = self.func(sandbox)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\resolve_tests.py",
line 647, in automatic_binary_conflict_resolution
    A_COPY_path)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py",
line 1909, in run_and_verify_resolve
    _run_and_verify_resolve('resolve', expected_paths, *args)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py",
line 1903, in _run_and_verify_resolve
    cmd, *args)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py",
line 313, in run_and_verify_svn
    expected_exit, *varargs)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py",
line 353, in run_and_verify_svn2
    expected_stdout, expected_stderr)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\verify.py",
line 453, in verify_outputs
    compare_and_display_lines(message, label, expected, actual, raisable)
  File
"G:\Projekte\MaxSVN\trunk\subversion\tests\cmdline\svntest\verify.py",
line 426, in compare_and_display_lines
    raise raisable
SVNLineUnequal
FAIL: resolve_tests.py 8: resolve -R --accept [base | mf | tf] binary file
END: resolve_tests.py
ELAPSED: resolve_tests.py 0:00:02.872000

Traceback (most recent call last):
  File "win-tests.py", line 1106, in <module>
    failed = th.run(tests_to_run)
  File "G:\Projekte\MaxSVN\trunk\build\run_tests.py", line 585, in run
    log_lines = self.log.readlines()
AttributeError: 'NoneType' object has no attribute 'readlines'

[1] = https://issues.apache.org/jira/browse/SVN-4647
[2] = http://svn.haxx.se/dev/archive-2016-08/0020.shtml

Regards,
Stefan