You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/16 19:21:46 UTC
[06/10] storm git commit: sortSlots test fix
sortSlots test fix
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/719de799
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/719de799
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/719de799
Branch: refs/heads/master
Commit: 719de7990cafe7cbd6f1d2127a0e0f65f7672592
Parents: defcb96
Author: Xin Wang <be...@163.com>
Authored: Wed Mar 16 12:30:12 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Wed Mar 16 12:30:12 2016 +0800
----------------------------------------------------------------------
.../test/clj/org/apache/storm/scheduler_test.clj | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/719de799/storm-core/test/clj/org/apache/storm/scheduler_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/scheduler_test.clj b/storm-core/test/clj/org/apache/storm/scheduler_test.clj
index 0d74daf..430702e 100644
--- a/storm-core/test/clj/org/apache/storm/scheduler_test.clj
+++ b/storm-core/test/clj/org/apache/storm/scheduler_test.clj
@@ -15,7 +15,7 @@
;; limitations under the License.
(ns org.apache.storm.scheduler-test
(:use [clojure test])
- (:use [org.apache.storm config testing])
+ (:use [org.apache.storm util config testing])
(:import [org.apache.storm.scheduler EvenScheduler])
(:require [org.apache.storm.daemon [nimbus :as nimbus]])
(:import [org.apache.storm.generated StormTopology])
@@ -262,13 +262,20 @@
(deftest test-sort-slots
;; test supervisor2 has more free slots
- (is (= "[supervisor2:6700, supervisor1:6700, supervisor2:6701, supervisor1:6701, supervisor2:6702]"
- (.toString (EvenScheduler/sortSlots [(WorkerSlot. "supervisor1" 6700) (WorkerSlot. "supervisor1" 6701)
+ (is (= [(WorkerSlot. "supervisor2" 6700) (WorkerSlot. "supervisor1" 6700)
+ (WorkerSlot. "supervisor2" 6701) (WorkerSlot. "supervisor1" 6701)
+ (WorkerSlot. "supervisor2" 6702)]
+ (clojurify-structure (EvenScheduler/sortSlots [
+ (WorkerSlot. "supervisor1" 6700) (WorkerSlot. "supervisor1" 6701)
(WorkerSlot. "supervisor2" 6700) (WorkerSlot. "supervisor2" 6701) (WorkerSlot. "supervisor2" 6702)
]))))
;; test supervisor3 has more free slots
- (is (= "[supervisor3:6700, supervisor2:6700, supervisor1:6700, supervisor3:6701, supervisor2:6701, supervisor1:6701, supervisor3:6702, supervisor2:6702, supervisor3:6703]"
- (.toString (EvenScheduler/sortSlots [(WorkerSlot. "supervisor1" 6700) (WorkerSlot. "supervisor1" 6701)
+ (is (= [(WorkerSlot. "supervisor3" 6700) (WorkerSlot. "supervisor2" 6700) (WorkerSlot. "supervisor1" 6700)
+ (WorkerSlot. "supervisor3" 6701) (WorkerSlot. "supervisor2" 6701) (WorkerSlot. "supervisor1" 6701)
+ (WorkerSlot. "supervisor3" 6702) (WorkerSlot. "supervisor2" 6702)
+ (WorkerSlot. "supervisor3" 6703)]
+ (clojurify-structure (EvenScheduler/sortSlots [
+ (WorkerSlot. "supervisor1" 6700) (WorkerSlot. "supervisor1" 6701)
(WorkerSlot. "supervisor2" 6700) (WorkerSlot. "supervisor2" 6701) (WorkerSlot. "supervisor2" 6702)
(WorkerSlot. "supervisor3" 6700) (WorkerSlot. "supervisor3" 6703) (WorkerSlot. "supervisor3" 6702) (WorkerSlot. "supervisor3" 6701)
]))))