8212695: Add explicit timeout to several HTTP Client tests

Reviewed-by: dfuchs, michaelm
This commit is contained in:
Chris Hegarty 2018-10-22 12:25:31 +01:00
parent 5b925d80f5
commit cea4eef60a
2 changed files with 25 additions and 13 deletions

View File

@ -36,10 +36,19 @@
* java.base/sun.net.www.http
* java.base/sun.net.www
* java.base/sun.net
* @run main/othervm DigestEchoClientSSL SSL
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=
* -Djdk.http.auth.tunneling.disabledSchemes=
* DigestEchoClientSSL SSL PROXY
* @run main/othervm/timeout=300
* DigestEchoClientSSL SSL
* @run main/othervm/timeout=300
* DigestEchoClientSSL SSL
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=
* -Djdk.http.auth.tunneling.disabledSchemes=
* DigestEchoClientSSL SSL PROXY
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=
* -Djdk.http.auth.tunneling.disabledSchemes=
* DigestEchoClientSSL SSL PROXY
*
*/
public class DigestEchoClientSSL {

View File

@ -38,15 +38,18 @@
* java.base/sun.net.www.http
* java.base/sun.net.www
* java.base/sun.net
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic,Digest
* -Djdk.http.auth.tunneling.disabledSchemes=Digest,Basic
* ProxyAuthDisabledSchemesSSL SSL
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic
* -Djdk.http.auth.tunneling.disabledSchemes=Basic
* ProxyAuthDisabledSchemesSSL SSL PROXY
* @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Digest
* -Djdk.http.auth.tunneling.disabledSchemes=Digest
* ProxyAuthDisabledSchemesSSL SSL PROXY
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=Basic,Digest
* -Djdk.http.auth.tunneling.disabledSchemes=Digest,Basic
* ProxyAuthDisabledSchemesSSL SSL
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=Basic
* -Djdk.http.auth.tunneling.disabledSchemes=Basic
* ProxyAuthDisabledSchemesSSL SSL PROXY
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=Digest
* -Djdk.http.auth.tunneling.disabledSchemes=Digest
* ProxyAuthDisabledSchemesSSL SSL PROXY
*/
public class ProxyAuthDisabledSchemesSSL {