# HG changeset patch
# User chegar
# Date 1540207531 -3600
# Node ID f298d05357fe50f988cb8e9d1d6bce44bd6f6fd2
# Parent  f59960ebed2030cd6db78fb5ddd586aa0d5d3a07
8212695: Add explicit timeout to several HTTP Client tests
Reviewed-by: dfuchs, michaelm

diff -r f59960ebed20 -r f298d05357fe test/jdk/java/net/httpclient/DigestEchoClientSSL.java
--- 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 {
diff -r f59960ebed20 -r f298d05357fe test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
--- 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 {