changeset 46093:5d86e010d558

8185794: java/net/httpclient/security/Driver.java fails in timeout Summary: added missing permission in policy files and increased timeout. Reviewed-by: rriggs, xiaofeya
author dfuchs
date Fri, 04 Aug 2017 10:54:48 +0100
parents a24d70e09fb0
children 0c23b05caf7d
files jdk/test/java/net/httpclient/security/0.policy jdk/test/java/net/httpclient/security/1.policy jdk/test/java/net/httpclient/security/10.policy jdk/test/java/net/httpclient/security/11.policy jdk/test/java/net/httpclient/security/12.policy jdk/test/java/net/httpclient/security/14.policy jdk/test/java/net/httpclient/security/15.policy jdk/test/java/net/httpclient/security/2.policy jdk/test/java/net/httpclient/security/3.policy jdk/test/java/net/httpclient/security/4.policy jdk/test/java/net/httpclient/security/5.policy jdk/test/java/net/httpclient/security/6.policy jdk/test/java/net/httpclient/security/7.policy jdk/test/java/net/httpclient/security/8.policy jdk/test/java/net/httpclient/security/9.policy jdk/test/java/net/httpclient/security/Driver.java
diffstat 16 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/java/net/httpclient/security/0.policy	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/0.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/1.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/10.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -22,6 +22,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/11.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -24,6 +24,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/12.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -24,6 +24,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/14.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/15.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -26,6 +26,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/2.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/3.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/4.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -24,6 +24,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/5.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/6.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/7.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/8.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/9.policy	Fri Aug 04 10:54:48 2017 +0100
@@ -23,6 +23,7 @@
 
 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	Thu Aug 03 09:04:47 2017 -0700
+++ b/jdk/test/java/net/httpclient/security/Driver.java	Fri Aug 04 10:54:48 2017 +0100
@@ -1,5 +1,5 @@
 /*
- * 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
  */
 
 /**