Repository: storm Updated Branches: refs/heads/1.x-branch 7670c6350 -> f13f8ad0e
STORM-1671: apply test changes Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f13f8ad0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f13f8ad0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f13f8ad0 Branch: refs/heads/1.x-branch Commit: f13f8ad0e3f65e0c130d447373c48409cb9488bb Parents: 7670c63 Author: P. Taylor Goetz <[email protected]> Authored: Fri Apr 1 15:52:25 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Apr 1 15:52:25 2016 -0400 ---------------------------------------------------------------------- .../clj/org/apache/storm/logviewer_test.clj | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/f13f8ad0/storm-core/test/clj/org/apache/storm/logviewer_test.clj ---------------------------------------------------------------------- diff --git a/storm-core/test/clj/org/apache/storm/logviewer_test.clj b/storm-core/test/clj/org/apache/storm/logviewer_test.clj index c13e869..0abcda6 100644 --- a/storm-core/test/clj/org/apache/storm/logviewer_test.clj +++ b/storm-core/test/clj/org/apache/storm/logviewer_test.clj @@ -238,18 +238,20 @@ (is (= expected (logviewer/identify-worker-log-dirs [port1-dir]))))))) (deftest test-get-dead-worker-dirs - (testing "removes any files of workers that are still alive" - (let [conf {SUPERVISOR-WORKER-TIMEOUT-SECS 5} - id->hb {"42" {:time-secs 1}} - now-secs 2 - unexpected-dir (mk-mock-File {:name "dir1" :type :directory}) - expected-dir (mk-mock-File {:name "dir2" :type :directory}) - log-dirs #{unexpected-dir expected-dir}] - (stubbing [logviewer/identify-worker-log-dirs {"42" unexpected-dir, - "007" expected-dir} - supervisor/read-worker-heartbeats id->hb] - (is (= #{expected-dir} - (logviewer/get-dead-worker-dirs conf now-secs log-dirs))))))) + (testing "return directories for workers that are not alive" + (let [conf {SUPERVISOR-WORKER-TIMEOUT-SECS 5} + id->hb {"42" {:time-secs 1}} ;; map for alive ids + now-secs 2 + unexpected-dir1 (mk-mock-File {:name "dir1" :type :directory}) + expected-dir2 (mk-mock-File {:name "dir2" :type :directory}) + expected-dir3 (mk-mock-File {:name "dir3" :type :directory}) + log-dirs #{unexpected-dir1 expected-dir2 expected-dir3}] + (stubbing [logviewer/identify-worker-log-dirs {"42" unexpected-dir1, + "007" expected-dir2, + "" expected-dir3} ;; this tests a directory with no yaml file thus no worker id + supervisor/read-worker-heartbeats id->hb] + (is (= #{expected-dir2 expected-dir3} + (logviewer/get-dead-worker-dirs conf now-secs log-dirs))))))) (deftest test-cleanup-fn (testing "cleanup function rmr's files of dead workers"
