8288899: java/util/concurrent/ExecutorService/CloseTest.java failed with "InterruptedException: sleep interrupted"

test/jdk/java/util/concurrent/tck/JSR166TestCase.java

@@ -1649,18 +1649,9 @@ <T> void checkTimedGet(Future<T> f, T expectedValue) {
 
     // Avoids unwanted interrupts when run inder jtreg
     static ThreadGroup topThreadGroup() {
-        ThreadGroup g = Thread.currentThread().getThreadGroup();
-        for (ThreadGroup p;;) {
-            try {
-                p = g.getParent();
-            } catch (Exception ok) { // possible under SecurityManager
-                break;
-            }
-            if (p == null)
-                break;
-            g = p;
-        }
-        return g;
+        for (ThreadGroup g = Thread.currentThread().getThreadGroup(), p; ; g = p)
+            if ((p = g.getParent()) == null)
+                return g;
     }
     static final ThreadGroup jsr166TestThreadGroup =
         new ThreadGroup(topThreadGroup(), "jsr1666TestThreadGroup");

test/jdk/java/util/concurrent/tck/tck.policy

@@ -1,6 +1,7 @@
 grant {
     // Permissions j.u.c. needs directly
     permission java.lang.RuntimePermission "modifyThread";
+    permission java.lang.RuntimePermission "modifyThreadGroup";
     permission java.lang.RuntimePermission "getClassLoader";
     permission java.lang.RuntimePermission "setContextClassLoader";
     permission java.util.PropertyPermission "*", "read";