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 053031799D for ; Wed, 27 May 2015 17:51:51 +0000 (UTC) Received: (qmail 77894 invoked by uid 500); 27 May 2015 17:51:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77861 invoked by uid 500); 27 May 2015 17:51:50 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 77852 invoked by uid 99); 27 May 2015 17:51:50 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 17:51:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 59CFF1A33D9 for ; Wed, 27 May 2015 17:51:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 4.541 X-Spam-Level: **** X-Spam-Status: No, score=4.541 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, TVD_SPACE_RATIO_MINFP=2.75, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id EMo_wLF3fBOO for ; Wed, 27 May 2015 17:51:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 1E9A2209DC for ; Wed, 27 May 2015 17:51:40 +0000 (UTC) Received: (qmail 77705 invoked by uid 99); 27 May 2015 17:51:40 -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, 27 May 2015 17:51:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED299DFFF0; Wed, 27 May 2015 17:51:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: Ignite-929 Date: Wed, 27 May 2015 17:51:39 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-929 d58f5cd4d -> 19b0c2bed Ignite-929 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19b0c2be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19b0c2be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19b0c2be Branch: refs/heads/ignite-929 Commit: 19b0c2bed2e843b5a84c34fbc79af75615fc75b6 Parents: d58f5cd Author: avinogradov Authored: Wed May 27 20:51:28 2015 +0300 Committer: avinogradov Committed: Wed May 27 20:51:28 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheStopAndDestroySelfTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19b0c2be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java index 48769da..4acd9f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java @@ -321,16 +321,13 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { grid(2).getOrCreateCache(cCfgCNear); grid(2).createNearCache(CACHE_NAME_CLOSE_NEAR, new NearCacheConfiguration()); + grid(2).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL); grid(0).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL + "recreated"); assert grid(0).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + "recreated"); assert grid(1).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + "recreated"); assert grid(2).cache(CACHE_NAME_CLOSE_NEAR).localPeek(KEY_VAL).equals(KEY_VAL + "recreated"); - grid(0).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL + "recreated2"); - - assert grid(2).cache(CACHE_NAME_CLOSE_NEAR).localPeek(KEY_VAL).equals(KEY_VAL + "recreated2"); - //Local close. Same as Local destroy. grid(1).cache(CACHE_NAME_CLOSE_LOC).close(); @@ -367,4 +364,10 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { assert grid(1).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + "recreated1"); assert grid(2).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + "recreated2"); } + + @Override protected void afterTest() throws Exception { + super.afterTest(); + + stopAllGrids(); + } }