8185794: java/net/httpclient/security/Driver.java fails in timeout

Added missing permission in policy files and increased timeout. Reviewed-by: rriggs, xiaofeya

8185794: java/net/httpclient/security/Driver.java fails in timeout
366c888f · Daniel Fuchs · 5ca53cfb · 366c888f · 366c888f · 366c888f
Commit 366c888f authored Aug 4, 2017 by Daniel Fuchs
--- a/jdk/test/java/net/httpclient/security/0.policy
+++ b/jdk/test/java/net/httpclient/security/0.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/1.policy
+++ b/jdk/test/java/net/httpclient/security/1.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/10.policy
+++ b/jdk/test/java/net/httpclient/security/10.policy
@@ -22,6 +22,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/11.policy
+++ b/jdk/test/java/net/httpclient/security/11.policy
@@ -24,6 +24,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/12.policy
+++ b/jdk/test/java/net/httpclient/security/12.policy
@@ -24,6 +24,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/14.policy
+++ b/jdk/test/java/net/httpclient/security/14.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/15.policy
+++ b/jdk/test/java/net/httpclient/security/15.policy
@@ -26,6 +26,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/2.policy
+++ b/jdk/test/java/net/httpclient/security/2.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/3.policy
+++ b/jdk/test/java/net/httpclient/security/3.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/4.policy
+++ b/jdk/test/java/net/httpclient/security/4.policy
@@ -24,6 +24,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/5.policy
+++ b/jdk/test/java/net/httpclient/security/5.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/6.policy
+++ b/jdk/test/java/net/httpclient/security/6.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/7.policy
+++ b/jdk/test/java/net/httpclient/security/7.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/8.policy
+++ b/jdk/test/java/net/httpclient/security/8.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/9.policy
+++ b/jdk/test/java/net/httpclient/security/9.policy
@@ -23,6 +23,7 @@ grant codebase "file:${test.classes}/proxydir/-" {
 grant codeBase "jrt:/jdk.incubator.httpclient" {
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";

--- a/jdk/test/java/net/httpclient/security/Driver.java
+++ b/jdk/test/java/net/httpclient/security/Driver.java
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 * @compile ../ProxyServer.java
 * @build Security
 *
- * @run driver/timeout=60 Driver
+ * @run driver/timeout=90 Driver
 */
 /**