Daniel Shahaf wrote on Sat, 26 Apr 2008 at 13:34 +0300:
> jeremy hinds wrote on Fri, 25 Apr 2008 at 22:58 -0600:
> > My plan was to
> > get a Windows build working to test this before submitting the updated
> > patch, but I think I'm going to have to throw in the towel on that for
> > now. I did at least extract the Popen functionality into a separate
> > script and ran that on Windows (I should have done this before). The
> > pertinent lines in the patch are
> >
> > + close_fds=False
> > + if is_posix_os():
> > + close_fds=True
> > + # (use universal newlines for text mode)
> > + kid = Popen(command, shell=False, bufsize=-1,
> > + universal_newlines=(not binary_mode),
> > + stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=close_fds)
> > + return kid.stdin, kid.stdout, kid.stderr, (kid, command)
> >
> > The only other difference between this and the previous iteration is
> > the removal of another comment in svntest/main.py.
> >
>
> Yes, the tests run now against the latest svn binary I have, and pass
> (except for some failures unrelated to your patch). I'll try and test the
> patch against HEAD this week, if no one beats me to it.
Your patch breaks merge_tests 43 64 76 86 for me. The output from #43 is:
=============================================================
Expected 'E1' and actual 'E1' in disk tree are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: E1
Path: __SVN_ROOT_NODE\F\E1
Contents: N/A (node is a directory)
Properties: {'svn:mergeinfo': '/A/B/F/E:5\n/A/B/F/E1:5-8\n'}
Attributes: {}
Children: 2
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: E1
Path: F\E1
Contents: N/A (node is a directory)
Properties: {'svn:mergeinfo': '/A/B/F/E:5\n\n/A/B/F/E1:5-8\n'}
Attributes: {}
Children: 2
Unequal at node E1
Unequal at node F
EXCEPTION: SVNTreeUnequal
I think I saw earlier a FAIL in one of the #1 tests as well (i.e.,
log_tests 1 or lock_tests 1, etc.), but I can't reproduce it now.
I have not finished the test run after I verified that the merge_tests
failure was caused by the patch.
HTH,
Daniel
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-27 14:59:36 CEST