geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esh...@apache.org
Subject incubator-geode git commit: Removed unused variables in the test. Add pollInterval and pollDelay when await.
Date Tue, 31 May 2016 18:26:41 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1400 b7f5d31d8 -> 5d6313910


Removed unused variables in the test.
Add pollInterval and pollDelay when await.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5d631391
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5d631391
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5d631391

Branch: refs/heads/feature/GEODE-1400
Commit: 5d6313910f04ab3e53db558f12f62fdfb0d4b5b1
Parents: b7f5d31
Author: eshu <eshu@pivotal.io>
Authored: Thu May 26 22:23:09 2016 -0700
Committer: eshu <eshu@pivotal.io>
Committed: Thu May 26 22:23:09 2016 -0700

----------------------------------------------------------------------
 .../gemstone/gemfire/internal/cache/TXManagerImplTest.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d631391/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
index efbb271..a4b8127 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
@@ -41,13 +41,10 @@ public class TXManagerImplTest {
   TXId txid;
   DestroyMessage msg;
   TXCommitMessage txCommitMsg;
-  TXStateProxy globaltx1;
-  TXStateProxy globaltx2;
   TXId completedTxid;
   TXId notCompletedTxid;
   InternalDistributedMember member;
   CountDownLatch latch = new CountDownLatch(1);
-  volatile int count = 0;
   TXStateProxy tx1, tx2;
 
   @Before
@@ -192,7 +189,8 @@ public class TXManagerImplTest {
 
         latch.countDown();
         
-        Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> tx1.getLock().hasQueuedThreads());

+        Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS)
+        .atMost(30, TimeUnit.SECONDS).until(() -> tx1.getLock().hasQueuedThreads()); 
         
         txMgr.removeHostedTXState(txid);
         
@@ -206,7 +204,7 @@ public class TXManagerImplTest {
     });
     t1.start();
             
-    latch.await(15, TimeUnit.SECONDS);
+    assertTrue(latch.await(60, TimeUnit.SECONDS));
   
     tx = txMgr.masqueradeAs(msg);
     assertNotNull(tx);


Mime
View raw message