storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/3] storm git commit: STORM-1844: Make netty unit test use STORM_TEST_TIMEOUT_MS, increase STORM_TEST_TIMEOUT_MS to 10 seconds, increase DisruptorQueueTest timeout to 5 seconds from 1
Date Fri, 08 Jul 2016 09:09:56 GMT
Repository: storm
Updated Branches:
  refs/heads/1.x-branch bc09e3f77 -> 64d4bccf9


STORM-1844: Make netty unit test use STORM_TEST_TIMEOUT_MS, increase STORM_TEST_TIMEOUT_MS
to 10 seconds, increase DisruptorQueueTest timeout to 5 seconds from 1


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

Branch: refs/heads/1.x-branch
Commit: dd16ff2956c17707ab5637dd21a695daff7301cc
Parents: bc09e3f
Author: Stig Rohde Døssing <sdo@it-minds.dk>
Authored: Tue May 17 11:31:08 2016 +0200
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Fri Jul 8 18:07:48 2016 +0900

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/testing.clj                    | 2 +-
 storm-core/test/clj/org/apache/storm/messaging/netty_unit_test.clj | 2 +-
 storm-core/test/jvm/org/apache/storm/utils/DisruptorQueueTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/dd16ff29/storm-core/src/clj/org/apache/storm/testing.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/testing.clj b/storm-core/src/clj/org/apache/storm/testing.clj
index 87ca2de..5e5700c 100644
--- a/storm-core/src/clj/org/apache/storm/testing.clj
+++ b/storm-core/src/clj/org/apache/storm/testing.clj
@@ -214,7 +214,7 @@
 
 (def TEST-TIMEOUT-MS
   (let [timeout (System/getenv "STORM_TEST_TIMEOUT_MS")]
-    (parse-int (if timeout timeout "5000"))))
+    (parse-int (if timeout timeout "10000"))))
 
 (defmacro while-timeout [timeout-ms condition & body]
   `(let [end-time# (+ (System/currentTimeMillis) ~timeout-ms)]

http://git-wip-us.apache.org/repos/asf/storm/blob/dd16ff29/storm-core/test/clj/org/apache/storm/messaging/netty_unit_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/messaging/netty_unit_test.clj b/storm-core/test/clj/org/apache/storm/messaging/netty_unit_test.clj
index 786045e..ef9e668 100644
--- a/storm-core/test/clj/org/apache/storm/messaging/netty_unit_test.clj
+++ b/storm-core/test/clj/org/apache/storm/messaging/netty_unit_test.clj
@@ -112,7 +112,7 @@
         _ (wait-until-ready [server client])
         _ (.send client task (.getBytes req_msg))
         _ (.sendLoadMetrics server {(int 1) 0.0 (int 2) 1.0})
-        _ (while-timeout 5000 (empty? (.getLoad client [(int 1) (int 2)])) (Thread/sleep
10))
+        _ (while-timeout TEST-TIMEOUT-MS (empty? (.getLoad client [(int 1) (int 2)])) (Thread/sleep
10))
         load (.getLoad client [(int 1) (int 2)])]
     (is (= 0.0 (.getBoltLoad (.get load (int 1)))))
     (is (= 1.0 (.getBoltLoad (.get load (int 2)))))

http://git-wip-us.apache.org/repos/asf/storm/blob/dd16ff29/storm-core/test/jvm/org/apache/storm/utils/DisruptorQueueTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/utils/DisruptorQueueTest.java b/storm-core/test/jvm/org/apache/storm/utils/DisruptorQueueTest.java
index b1f76ec..e7ac54e 100644
--- a/storm-core/test/jvm/org/apache/storm/utils/DisruptorQueueTest.java
+++ b/storm-core/test/jvm/org/apache/storm/utils/DisruptorQueueTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
 
 public class DisruptorQueueTest extends TestCase {
 
-    private final static int TIMEOUT = 1000; // MS
+    private final static int TIMEOUT = 5000; // MS
     private final static int PRODUCER_NUM = 4;
 
     @Test


Mime
View raw message