You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/06/15 16:23:58 UTC

[2/4] storm git commit: STORM-864 Adjust drpc timeout to 2 times of TEST-TIMEOUT-MS

STORM-864 Adjust drpc timeout to 2 times of TEST-TIMEOUT-MS

* also print traceback to find out why exception happens


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

Branch: refs/heads/master
Commit: cebe13641939dc213ac98e40a3ee43b9f3b147a2
Parents: 99cfe28
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jun 12 00:17:48 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jun 12 09:10:31 2015 +0900

----------------------------------------------------------------------
 dev-tools/travis/print-errors-from-clojure-test-reports.py     | 2 ++
 .../test/clj/backtype/storm/security/auth/drpc_auth_test.clj   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/cebe1364/dev-tools/travis/print-errors-from-clojure-test-reports.py
----------------------------------------------------------------------
diff --git a/dev-tools/travis/print-errors-from-clojure-test-reports.py b/dev-tools/travis/print-errors-from-clojure-test-reports.py
index 1cb88fc..3d08c8a 100644
--- a/dev-tools/travis/print-errors-from-clojure-test-reports.py
+++ b/dev-tools/travis/print-errors-from-clojure-test-reports.py
@@ -15,6 +15,7 @@
 import os
 import sys
 import glob
+import traceback
 from xml.etree.ElementTree import ElementTree
 
 
@@ -48,6 +49,7 @@ def main(report_dir_path):
         except Exception, e:
             print "Error while reading report file, %s" % file_path
             print "Exception: %s" % e
+            traceback.print_exc()
 
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/storm/blob/cebe1364/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
index b6ede3b..1149a60 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
@@ -31,6 +31,8 @@
 
 (def drpc-timeout (Integer. 30))
 
+(def DRPC-TIMEOUT-SEC (* (/ TEST-TIMEOUT-MS 1000) 2))
+
 (defn launch-server [conf drpcAznClass transportPluginClass login-cfg client-port invocations-port]
   (let [conf (if drpcAznClass (assoc conf DRPC-AUTHORIZER drpcAznClass) conf)
         conf (if transportPluginClass (assoc conf STORM-THRIFT-TRANSPORT-PLUGIN transportPluginClass) conf)
@@ -145,7 +147,7 @@
 
 (deftest drpc-per-function-auth-strict-test
   (with-simple-drpc-test-scenario [true alice-client bob-client charlie-client alice-invok charlie-invok]
-    (let [drpc-timeout-seconds 10]
+    (let [drpc-timeout-seconds DRPC-TIMEOUT-SEC]
       (testing "Permitted user can execute a function in the ACL"
         (let [func "jump"
               exec-ftr (future (.execute alice-client func "some args"))
@@ -221,7 +223,7 @@
 
 (deftest drpc-per-function-auth-non-strict-test
   (with-simple-drpc-test-scenario [false alice-client bob-client charlie-client alice-invok charlie-invok]
-    (let [drpc-timeout-seconds 10]
+    (let [drpc-timeout-seconds DRPC-TIMEOUT-SEC]
       (testing "Permitted user can execute a function in the ACL"
         (let [func "jump"
               exec-ftr (future (.execute alice-client func "some args"))