fix platform-specific path separators (missed in a previous merge)
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7ab4f241 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ab4f241 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ab4f241 Branch: refs/heads/master Commit: 7ab4f2418b99ebec0c27c4042942a26e4f4972be Parents: d2707d3 Author: P. Taylor Goetz <[email protected]> Authored: Tue Oct 7 17:16:17 2014 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Tue Oct 7 17:16:17 2014 -0400 ---------------------------------------------------------------------- .../test/clj/backtype/storm/supervisor_test.clj | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/7ab4f241/storm-core/test/clj/backtype/storm/supervisor_test.clj ---------------------------------------------------------------------- diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj index a61a2ae..ba74d88 100644 --- a/storm-core/test/clj/backtype/storm/supervisor_test.clj +++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj @@ -247,7 +247,7 @@ (let [mock-port "42" mock-storm-id "fake-storm-id" mock-worker-id "fake-worker-id" - mock-cp "/base:/stormjar.jar" + mock-cp (str file-path-separator "base" class-path-separator file-path-separator "stormjar.jar") exp-args-fn (fn [opts topo-opts classpath] (concat [(supervisor/java-cmd) "-server"] opts @@ -255,10 +255,8 @@ ["-Djava.library.path=" (str "-Dlogfile.name=worker-" mock-port ".log") "-Dstorm.home=" - "-Dstorm.conf.file=" - "-Dstorm.options=" - "-Dstorm.log.dir=/logs" - "-Dlogback.configurationFile=/logback/cluster.xml" + (str "-Dstorm.log.dir=" file-path-separator "logs") + (str "-Dlogback.configurationFile=" file-path-separator "logback" file-path-separator "cluster.xml") (str "-Dstorm.id=" mock-storm-id) (str "-Dworker.id=" mock-worker-id) (str "-Dworker.port=" mock-port) @@ -308,14 +306,14 @@ [0] exp-args)))) (testing "testing topology.classpath is added to classpath" - (let [topo-cp "/any/path" + (let [topo-cp (str file-path-separator "any" file-path-separator "path") exp-args (exp-args-fn [] [] (add-to-classpath mock-cp [topo-cp])) mock-supervisor {:conf {STORM-CLUSTER-MODE :distributed}}] (stubbing [read-supervisor-storm-conf {TOPOLOGY-CLASSPATH topo-cp} supervisor-stormdist-root nil supervisor/jlp nil launch-process nil - current-classpath "/base"] + current-classpath (str file-path-separator "base")] (supervisor/launch-worker mock-supervisor mock-storm-id mock-port @@ -331,7 +329,7 @@ supervisor-stormdist-root nil supervisor/jlp nil launch-process nil - current-classpath "/base"] + current-classpath (str file-path-separator "base")] (supervisor/launch-worker mock-supervisor mock-storm-id mock-port @@ -471,4 +469,4 @@ (validate-launched-once (:launched changed) {"sup1" [3 4]} (get-storm-id (:storm-cluster-state cluster) "topology2")) - ))) + ))) \ No newline at end of file
