Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 8337E106D0 for ; Wed, 9 Sep 2015 08:53:00 +0000 (UTC) Received: (qmail 1578 invoked by uid 500); 9 Sep 2015 08:53:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 1487 invoked by uid 500); 9 Sep 2015 08:53:00 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 1175 invoked by uid 99); 9 Sep 2015 08:53:00 -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, 09 Sep 2015 08:53:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3360EE0252; Wed, 9 Sep 2015 08:53:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 09 Sep 2015 08:53:17 -0000 Message-Id: <8101971d98a54db8a27691f4167bee88@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/43] ignite git commit: Increased test timeout. Increased test timeout. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86f80372 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86f80372 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86f80372 Branch: refs/heads/master Commit: 86f80372a23e502b58649b1e36c8a8a84f035318 Parents: c6d4b46 Author: sboikov Authored: Tue Sep 8 13:21:39 2015 +0300 Committer: sboikov Committed: Tue Sep 8 13:21:39 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridVersionSelfTest.java | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/86f80372/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java index d383ad6..4751a0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal; -import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER; @@ -36,20 +37,17 @@ public class GridVersionSelfTest extends GridCommonAbstractTest { System.setProperty(IGNITE_UPDATE_NOTIFIER, "true"); try { - IgniteEx ignite = (IgniteEx)startGrid(); + final IgniteEx ignite = (IgniteEx)startGrid(); IgniteProductVersion currVer = ignite.version(); - String newVer = null; + GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return ignite.latestVersion() != null; + } + }, 2 * 60_000); - for (int i = 0; i < 30; i++) { - newVer = ignite.latestVersion(); - - if (newVer != null) - break; - - U.sleep(100); - } + String newVer = ignite.latestVersion(); info("Versions [cur=" + currVer + ", latest=" + newVer + ']');