From 58366bce327f925d5b9f23aaf4cb6c5fffb16ac3 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Fri, 11 Jul 2014 14:53:55 +0100
Subject: [PATCH] 8049884: Reduce possible timing noise in
 com/sun/jndi/ldap/LdapTimeoutTest.java

Reviewed-by: vinnie
---
 jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java
index c5705bc4b74..ba507479e02 100644
--- a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java
+++ b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @run main/othervm LdapTimeoutTest
  * @bug 7094377 8000487 6176036 7056489
  * @summary Timeout tests for ldap
  */
@@ -147,7 +148,7 @@ public class LdapTimeoutTest {
     void deadServerNoTimeout(Hashtable env) {
         InitialContext ctx = null;
         ScheduledFuture killer = killSwitch(30_000);
-        long start = System.nanoTime();
+        long start = System.currentTimeMillis();
         try {
             ctx = new InitialDirContext(env);
             SearchControls scl = new SearchControls();
@@ -157,13 +158,11 @@ public class LdapTimeoutTest {
             // shouldn't reach here
             fail();
         } catch (NamingException e) {
-            long end = System.nanoTime();
-            long elapsed = NANOSECONDS.toMillis(end - start);
+            long elapsed = System.currentTimeMillis() - start;
             if (elapsed < Connection.DEFAULT_READ_TIMEOUT_MILLIS) {
-                System.err.printf(
-                        "fail: timeout should be at least %s ms, actual time is %s ms",
-                        Connection.DEFAULT_READ_TIMEOUT_MILLIS,
-                        elapsed);
+                System.err.printf("fail: timeout should be at least %s ms, " +
+                                "actual time is %s ms%n",
+                        Connection.DEFAULT_READ_TIMEOUT_MILLIS, elapsed);
                 e.printStackTrace();
                 fail();
             } else {