Skip to content

Commit 5792854

Browse files
committed
8212695: Add explicit timeout to several HTTP Client tests
Reviewed-by: shade Backport-of: cea4eef
1 parent e5ec679 commit 5792854

File tree

2 files changed

+27
-15
lines changed

2 files changed

+27
-15
lines changed

test/jdk/java/net/httpclient/DigestEchoClientSSL.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,19 @@
3636
* java.base/sun.net.www.http
3737
* java.base/sun.net.www
3838
* java.base/sun.net
39-
* @run main/othervm DigestEchoClientSSL SSL
40-
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=
41-
* -Djdk.http.auth.tunneling.disabledSchemes=
42-
* DigestEchoClientSSL SSL PROXY
39+
* @run main/othervm/timeout=300
40+
* DigestEchoClientSSL SSL
41+
* @run main/othervm/timeout=300
42+
* DigestEchoClientSSL SSL
43+
* @run main/othervm/timeout=300
44+
* -Djdk.http.auth.proxying.disabledSchemes=
45+
* -Djdk.http.auth.tunneling.disabledSchemes=
46+
* DigestEchoClientSSL SSL PROXY
47+
* @run main/othervm/timeout=300
48+
* -Djdk.http.auth.proxying.disabledSchemes=
49+
* -Djdk.http.auth.tunneling.disabledSchemes=
50+
* DigestEchoClientSSL SSL PROXY
51+
*
4352
*/
4453

4554
public class DigestEchoClientSSL {

test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,20 @@
3838
* java.base/sun.net.www.http
3939
* java.base/sun.net.www
4040
* java.base/sun.net
41-
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic,Digest
42-
* -Djdk.http.auth.tunneling.disabledSchemes=Digest,Basic
43-
* ProxyAuthDisabledSchemesSSL SSL
44-
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic
45-
* -Djdk.http.auth.tunneling.disabledSchemes=Basic
46-
* -Dtest.requiresHost=true
47-
* ProxyAuthDisabledSchemesSSL SSL PROXY
48-
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Digest
49-
* -Djdk.http.auth.tunneling.disabledSchemes=Digest
50-
* -Dtest.requiresHost=true
51-
* ProxyAuthDisabledSchemesSSL SSL PROXY
41+
* @run main/othervm/timeout=300
42+
* -Djdk.http.auth.proxying.disabledSchemes=Basic,Digest
43+
* -Djdk.http.auth.tunneling.disabledSchemes=Digest,Basic
44+
* ProxyAuthDisabledSchemesSSL SSL
45+
* @run main/othervm/timeout=300
46+
* -Djdk.http.auth.proxying.disabledSchemes=Basic
47+
* -Djdk.http.auth.tunneling.disabledSchemes=Basic
48+
* -Dtest.requiresHost=true
49+
* ProxyAuthDisabledSchemesSSL SSL PROXY
50+
* @run main/othervm/timeout=300
51+
* -Djdk.http.auth.proxying.disabledSchemes=Digest
52+
* -Djdk.http.auth.tunneling.disabledSchemes=Digest
53+
* -Dtest.requiresHost=true
54+
* ProxyAuthDisabledSchemesSSL SSL PROXY
5255
*/
5356

5457
public class ProxyAuthDisabledSchemesSSL {

0 commit comments

Comments
 (0)