Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Commit 17b6f7b

Browse files
author
Jamil Nimeh
committed
8309740: Expand timeout windows for tests in JDK-8179502
Reviewed-by: xuelei, hchao Backport-of: 5ca4cdd2caceba9dad8025e5a8851740a3961921
1 parent af3a56e commit 17b6f7b

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

test/jdk/java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@
3737
* @library ../../../../../java/security/testlibrary
3838
* @build CertificateBuilder SimpleOCSPServer
3939
* @run main/othervm OCSPTimeout 1000 true
40-
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=2
40+
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=5
4141
* OCSPTimeout 1000 true
4242
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=1
43-
* OCSPTimeout 2000 false
43+
* OCSPTimeout 5000 false
4444
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=1s
45-
* OCSPTimeout 2000 false
45+
* OCSPTimeout 5000 false
4646
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=1500ms
47-
* OCSPTimeout 2000 false
48-
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=2750ms
49-
* OCSPTimeout 2000 true
47+
* OCSPTimeout 5000 false
48+
* @run main/othervm -Dcom.sun.security.ocsp.readtimeout=4500ms
49+
* OCSPTimeout 1000 true
5050
*/
5151

5252
import java.io.*;

test/jdk/sun/security/x509/URICertStore/AIACertTimeout.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
* @library /test/lib ../../../../java/security/testlibrary
3131
* @build CertificateBuilder
3232
* @run main/othervm -Dcom.sun.security.enableAIAcaIssuers=true
33-
* -Dcom.sun.security.cert.readtimeout=1 AIACertTimeout 2000 false
33+
* -Dcom.sun.security.cert.readtimeout=1 AIACertTimeout 5000 false
3434
* @run main/othervm -Dcom.sun.security.enableAIAcaIssuers=true
35-
* -Dcom.sun.security.cert.readtimeout=1s AIACertTimeout 2000 false
35+
* -Dcom.sun.security.cert.readtimeout=1s AIACertTimeout 5000 false
3636
* @run main/othervm -Dcom.sun.security.enableAIAcaIssuers=true
37-
* -Dcom.sun.security.cert.readtimeout=3 AIACertTimeout 2000 true
37+
* -Dcom.sun.security.cert.readtimeout=4 AIACertTimeout 1000 true
3838
* @run main/othervm -Dcom.sun.security.enableAIAcaIssuers=true
39-
* -Dcom.sun.security.cert.readtimeout=1500ms AIACertTimeout 2000 false
39+
* -Dcom.sun.security.cert.readtimeout=1500ms AIACertTimeout 5000 false
4040
* @run main/othervm -Dcom.sun.security.enableAIAcaIssuers=true
41-
* -Dcom.sun.security.cert.readtimeout=2750ms AIACertTimeout 2000 true
41+
* -Dcom.sun.security.cert.readtimeout=4500ms AIACertTimeout 1000 true
4242
* @run main/othervm -Djava.security.debug=certpath
4343
* -Dcom.sun.security.enableAIAcaIssuers=false
4444
* -Dcom.sun.security.cert.readtimeout=20000ms AIACertTimeout 10000 false

test/jdk/sun/security/x509/URICertStore/CRLReadTimeout.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,16 @@
2828
* @modules java.base/sun.security.x509
2929
* java.base/sun.security.util
3030
* @library /test/lib
31-
* @run main/othervm -Dcom.sun.security.crl.readtimeout=1 CRLReadTimeout 2000 false
32-
* @run main/othervm -Dcom.sun.security.crl.readtimeout=1s CRLReadTimeout 2000 false
33-
* @run main/othervm -Dcom.sun.security.crl.readtimeout=4 CRLReadTimeout 2000 true
34-
* @run main/othervm -Dcom.sun.security.crl.readtimeout=1500ms CRLReadTimeout 2000 false
35-
* @run main/othervm -Dcom.sun.security.crl.readtimeout=2750ms CRLReadTimeout 2000 true
31+
* @run main/othervm -Dcom.sun.security.crl.readtimeout=1
32+
* CRLReadTimeout 5000 false
33+
* @run main/othervm -Dcom.sun.security.crl.readtimeout=1s
34+
* CRLReadTimeout 5000 false
35+
* @run main/othervm -Dcom.sun.security.crl.readtimeout=4
36+
* CRLReadTimeout 1000 true
37+
* @run main/othervm -Dcom.sun.security.crl.readtimeout=1500ms
38+
* CRLReadTimeout 5000 false
39+
* @run main/othervm -Dcom.sun.security.crl.readtimeout=4500ms
40+
* CRLReadTimeout 1000 true
3641
*/
3742

3843
import java.io.*;

0 commit comments

Comments
 (0)