You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/05/31 16:42:08 UTC

[04/10] cassandra git commit: Make testJsonThreadSafety less likely to time out

Make testJsonThreadSafety less likely to time out

Patch by Tyler Hobbs; reviewed by Alex Petrov for CASSANDRA-11711


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

Branch: refs/heads/trunk
Commit: a5dac1298b7cc899e9d1a327f15b31a94e1ce283
Parents: 66c8f2b
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:40:29 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:40:29 2016 -0500

----------------------------------------------------------------------
 .../apache/cassandra/cql3/validation/entities/JsonTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5dac129/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 824d436..4f49c3b 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -984,7 +984,7 @@ public class JsonTest extends CQLTester
     public void testJsonThreadSafety() throws Throwable
     {
         int numThreads = 10;
-        final int numRows = 10000;
+        final int numRows = 5000;
 
         createTable("CREATE TABLE %s (" +
                 "k text PRIMARY KEY, " +
@@ -1025,9 +1025,9 @@ public class JsonTest extends CQLTester
             futures.add(executor.submit(worker));
 
         for (Future future : futures)
-            future.get(10, TimeUnit.SECONDS);
+            future.get(30, TimeUnit.SECONDS);
 
         executor.shutdown();
-        Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
+        Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
     }
 }