You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2022/03/30 05:42:05 UTC
svn commit: r1899376 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Author: svn-role
Date: Wed Mar 30 05:42:05 2022
New Revision: 1899376
URL: http://svn.apache.org/viewvc?rev=1899376&view=rev
Log:
Merge r1898633 from trunk:
* r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:
Fix test failure
Votes:
+1: jamessan, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1898633
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899376&r1=1899375&r2=1899376&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:42:05 2022
@@ -45,13 +45,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1898633
- Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
- Justification:
- Fix test failure
- Votes:
- +1: jamessan, stsp
-
* r1881534
Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
Justification:
Modified: subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1899376&r1=1899375&r2=1899376&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Wed Mar 30 05:42:05 2022
@@ -4676,7 +4676,20 @@ public class BasicTests extends SVNTests
// RuntimeException("Test exception") is expected here
}
- tunnelAgent.joinAndTest();
+ // In this test, there is a race condition that sometimes results in
+ // IOException when 'WAIT_TUNNEL' tries to read from a pipe that
+ // already has its read end closed. This is not an error, but
+ // it's hard to distinguish this case from other IOException which
+ // indicate a problem. To reproduce, simply wrap this test's body in
+ // a loop. The workaround is to ignore any detected IOException.
+ try
+ {
+ tunnelAgent.join();
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
}
/**