changeset 52211:f298d05357fe

8212695: Add explicit timeout to several HTTP Client tests Reviewed-by: dfuchs, michaelm
author chegar
date Mon, 22 Oct 2018 12:25:31 +0100
parents f59960ebed20
children e6973df15152
files test/jdk/java/net/httpclient/DigestEchoClientSSL.java test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
diffstat 2 files changed, 25 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/java/net/httpclient/DigestEchoClientSSL.java	Mon Oct 22 11:51:17 2018 +0200
+++ b/test/jdk/java/net/httpclient/DigestEchoClientSSL.java	Mon Oct 22 12:25:31 2018 +0100
@@ -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 {
--- a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java	Mon Oct 22 11:51:17 2018 +0200
+++ b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java	Mon Oct 22 12:25:31 2018 +0100
@@ -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 {