storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [37/50] [abbrv] git commit: Merge remote-tracking branch 'apache/master' into STORM-335
Date Wed, 11 Jun 2014 16:10:09 GMT
Merge remote-tracking branch 'apache/master' into STORM-335

Conflicts:
	storm-core/test/clj/backtype/storm/drpc_test.clj


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

Branch: refs/heads/security
Commit: e69ead05a6ae098af6c7df65c5a725dea4d44d3f
Parents: e4e2879 dd1d213
Author: Derek Dagit <derekd@yahoo-inc.com>
Authored: Fri Jun 6 12:47:41 2014 -0500
Committer: Derek Dagit <derekd@yahoo-inc.com>
Committed: Fri Jun 6 12:47:41 2014 -0500

----------------------------------------------------------------------
 CHANGELOG.md                                      |  1 +
 storm-core/src/clj/backtype/storm/daemon/drpc.clj |  9 +++++----
 storm-core/test/clj/backtype/storm/drpc_test.clj  | 14 +++++++++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e69ead05/storm-core/test/clj/backtype/storm/drpc_test.clj
----------------------------------------------------------------------
diff --cc storm-core/test/clj/backtype/storm/drpc_test.clj
index 0a8b66b,0f7006a..6d0ba2b
--- a/storm-core/test/clj/backtype/storm/drpc_test.clj
+++ b/storm-core/test/clj/backtype/storm/drpc_test.clj
@@@ -221,11 -221,13 +221,23 @@@
      (.shutdown drpc)
      ))
  
 +(deftest test-dequeue-req-after-timeout
 +  (let [queue (ConcurrentLinkedQueue.)
 +        delay-seconds 2]
 +    (stubbing [acquire-queue queue
 +               read-storm-config {DRPC-REQUEST-TIMEOUT-SECS delay-seconds}]
 +      (let [drpc-handler (service-handler)]
-         (.execute drpc-handler "ArbitraryDRPCFunctionName" "")
++        (is (thrown? DRPCExecutionException
++          (.execute drpc-handler "ArbitraryDRPCFunctionName" "")))
 +        (is (= 0 (.size queue)))))))
++
+ (deftest test-drpc-timeout-cleanup 
+   (let [queue (ConcurrentLinkedQueue.)
+         delay-seconds 1]
+     (stubbing [acquire-queue queue
+                read-storm-config {DRPC-REQUEST-TIMEOUT-SECS delay-seconds}
+                timeout-check-secs delay-seconds]
+               (let [drpc-handler (service-handler)]
+                 (is (thrown? DRPCExecutionException 
+                              (.execute drpc-handler "ArbitraryDRPCFunctionName" "no-args")))))))
+ 


Mime
View raw message