On Fri, Sep 18, 2009 at 4:31 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Fri, Sep 18, 2009 at 4:14 PM, Paul Burba <ptburba_at_gmail.com> wrote:
>
>> You were right about this being caused by the recent svn mergeinfo
>> subcommand changes. I botched
>> libsvn_client/mergeinfo.c:svn_client_mergeinfo_get_merged() in r39350.
>> We don't use this API in Subversion so the test suite obviously
>> didn't catch the error. I fixed it in r39445 and clarified
>> svn_client_mergeinfo_get_merged()'s doc string. Both of those JavaHL
>> tests now pass.
>
> Confirmed, thanks!
>
> On Windows, do you get that one remaining test error?
>
> 1) testMergeConflictResolution(org.tigris.subversion.javahl.BasicTests)org.tigris.subversion.javahl.ClientException:
> Path is not an immediate child of the specified directory
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: traced call
> svn: Path '/var/folders/np/np0+f8EnHlacqSEtJRJGqk+++TI/-Tmp-/tempfile.3.tmp'
> is not a child of
> '/Users/mphippard/work/src-trunk/subversion/bindings/javahl/test-work/working_copies/basic_test36/A'
> svn: subversion/libsvn_client/merge.c:9277: (apr_err=125007)
> at org.tigris.subversion.javahl.SVNClient.merge(Native Method)
> at org.tigris.subversion.javahl.SVNClientSynchronized.merge(SVNClientSynchronized.java:1023)
> at org.tigris.subversion.javahl.BasicTests.testMergeConflictResolution(BasicTests.java:2601)
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at org.tigris.subversion.javahl.RunTests.main(RunTests.java:116)
>
> FAILURES!!!
> Tests run: 51, Failures: 0, Errors: 1
Mark,
I get that and two others:
C:\SVN\src-trunk-2\subversion\bindings\javahl\classes>java -cp
C:\SVN\src-trunk-2\subversion\bindings\javahl\classes;"C:\Program
Files\Java\jdk1.6.0_14\jre\lib\
ext\junit-4.4.jar" org.tigris.subversion.javahl.RunTests
...E..................................E....
E..........
Time: 106.766
There were 3 errors:
1) testLoadRepo(org.tigris.subversion.javahl.SVNAdminTests)java.io.FileNotFoundException:
subversion\bindings\javahl\tests\data\issue2979.dump (The system
cannot find the path specified)
at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.<init>(Unknown Source)
at org.tigris.subversion.javahl.SVNTests$FileInputer.<init>(SVNTests.java:509)
at org.tigris.subversion.javahl.SVNAdminTests.testLoadRepo(SVNAdminTests.java:110)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at org.tigris.subversion.javahl.RunTests.main(RunTests.java:116)
2) testBasicChangelist(org.tigris.subversion.javahl.BasicTests)java.lang.NullPointerException
at org.tigris.subversion.javahl.BasicTests.testBasicChangelist(BasicTests.java:2211)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at org.tigris.subversion.javahl.RunTests.main(RunTests.java:116)
3) testMergeConflictResolution(org.tigris.subversion.javahl.BasicTests)org.tigris.subversion.javahl.ClientException:
Path is not an immediate child of the specified directory
svn: Path 'C:\DOCUME~1\pburba\LOCALS~1\Temp\tempfile.46.tmp' is not a
child of 'C:\SVN\src-trunk-2\subversion\bindings\javahl\classes\working_copies\basic_test3
6\A'
at org.tigris.subversion.javahl.SVNClient.merge(Native Method)
at org.tigris.subversion.javahl.SVNClientSynchronized.merge(SVNClientSynchronized.java:1023)
at org.tigris.subversion.javahl.BasicTests.testMergeConflictResolution(BasicTests.java:2601)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at org.tigris.subversion.javahl.RunTests.main(RunTests.java:116)
FAILURES!!!
Tests run: 51, Failures: 0, Errors: 3
I've seen these for some time IIRC. I'll look into these.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2396621
Received on 2009-09-18 22:42:40 CEST