You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/01/08 01:18:49 UTC

[1/2] incubator-geode git commit: GEODE-452:We don't send client close response from server thus we need to wait for client termination before validating the HAStatsCleanup.

Repository: incubator-geode
Updated Branches:
  refs/heads/develop a097fcf32 -> fc18163f1


GEODE-452:We don't send client close response from server thus we need to
wait for client termination before validating the HAStatsCleanup.


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

Branch: refs/heads/develop
Commit: fc18163f164b06eb83744c6c54c957ff55e8df91
Parents: 531b8aa
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Thu Jan 7 16:10:19 2016 -0800
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Thu Jan 7 16:12:51 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java     | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fc18163f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 0545cd7..69f4142 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -155,6 +155,8 @@ public class Bug37210DUnitTest extends DistributedTestCase
     server.invoke(Bug37210DUnitTest.class,
         "closeCacheClientProxyAndVerifyStats");
     client.invoke(Bug37210DUnitTest.class, "closeCache");
+  //we don't send close response thus needs to wait for client termination
+    Thread.currentThread().sleep(1000);
     server.invoke(Bug37210DUnitTest.class,
             "closeCacheClientProxyAndVerifyStats2");
     getLogWriter().info("testHAStatsCleanup : END");


[2/2] incubator-geode git commit: GEODE-412 We were re-setting the value count after getting its value. Sepatrated that logic as test may look this count more than once.

Posted by hi...@apache.org.
GEODE-412 We were re-setting the value count after getting its value.
Sepatrated that logic as test may look this count more than once.


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

Branch: refs/heads/develop
Commit: 531b8aaeb10fa5c5d2b9729d247fee8aceb5f253
Parents: a097fcf
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Thu Jan 7 16:06:43 2016 -0800
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Thu Jan 7 16:12:51 2016 -0800

----------------------------------------------------------------------
 .../cache/execute/OnGroupsFunctionExecutionDUnitTest.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/531b8aae/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 5a642ca..6cb1ffd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -181,7 +181,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
         int count = 0;
         synchronized (OnGroupsFunction.class) {
         	count = f.invocationCount;
-            f.invocationCount = 0;
+        //    f.invocationCount = 0;
 		}
         
         return count;
@@ -746,7 +746,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
         } else {
           e.execute(new OnGroupsFunction()).getResult();
         }
-        return null;
+        return null;    
       }
     });
     verifyAndResetInvocationCount(server0, 1);
@@ -1235,5 +1235,8 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
       }
     };
     DistributedTestCase.waitForCriterion(wc2, 30000, 1000, true);
+    resetInvocationCount(server0);
+    resetInvocationCount(server1);
+    resetInvocationCount(server2);
   }
 }