Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EDF4218190 for ; Wed, 6 Apr 2016 22:45:09 +0000 (UTC) Received: (qmail 66434 invoked by uid 500); 6 Apr 2016 22:45:09 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 66404 invoked by uid 500); 6 Apr 2016 22:45:09 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 66395 invoked by uid 99); 6 Apr 2016 22:45:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2016 22:45:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A11E7DFC73; Wed, 6 Apr 2016 22:45:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andrewor14@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-14391][LAUNCHER] Increase test timeouts. Date: Wed, 6 Apr 2016 22:45:09 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master 5a4b11a90 -> de4792605 [SPARK-14391][LAUNCHER] Increase test timeouts. Most of the time tests should still pass really quickly; it's just when machines are overloaded that the tests may take a little time, but that's still preferable over just failing the test. Author: Marcelo Vanzin Closes #12210 from vanzin/SPARK-14391. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/de479260 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/de479260 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/de479260 Branch: refs/heads/master Commit: de4792605ad94d3d7548a2139372bb6cac331079 Parents: 5a4b11a Author: Marcelo Vanzin Authored: Wed Apr 6 15:45:03 2016 -0700 Committer: Andrew Or Committed: Wed Apr 6 15:45:03 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/spark/launcher/LauncherServerSuite.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/de479260/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java b/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java index a9039b3..bfe1fcc 100644 --- a/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java +++ b/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java @@ -83,13 +83,13 @@ public class LauncherServerSuite extends BaseSuite { client = new TestClient(s); client.send(new Hello(handle.getSecret(), "1.4.0")); - assertTrue(semaphore.tryAcquire(1, TimeUnit.SECONDS)); + assertTrue(semaphore.tryAcquire(30, TimeUnit.SECONDS)); // Make sure the server matched the client to the handle. assertNotNull(handle.getConnection()); client.send(new SetAppId("app-id")); - assertTrue(semaphore.tryAcquire(1, TimeUnit.SECONDS)); + assertTrue(semaphore.tryAcquire(30, TimeUnit.SECONDS)); assertEquals("app-id", handle.getAppId()); client.send(new SetState(SparkAppHandle.State.RUNNING)); @@ -97,7 +97,7 @@ public class LauncherServerSuite extends BaseSuite { assertEquals(SparkAppHandle.State.RUNNING, handle.getState()); handle.stop(); - Message stopMsg = client.inbound.poll(10, TimeUnit.SECONDS); + Message stopMsg = client.inbound.poll(30, TimeUnit.SECONDS); assertTrue(stopMsg instanceof Stop); } finally { kill(handle); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org