Merge pull request TheClimateCorporation#18 from jeddenlea/master

Misc fixes.
jeroenvandijk · Mar 21, 2013 · d537c99 · d537c99
2 parents 99083bf + 147c4d0
commit d537c99
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/main/clj/com/climate/services/aws/ec2.clj b/src/main/clj/com/climate/services/aws/ec2.clj
@@ -125,9 +125,10 @@
   ([hours]
    (spot-price-history hours nil))
   ([hours type]
-   (let [now (GregorianCalendar.)
-         end (.getTime now)
-         start (.getTime (.add now GregorianCalendar/HOUR_OF_DAY hours))
+   (let [[start end] (let [volatile-cal (GregorianCalendar.)
+                           end (.getTime volatile-cal)]
+                       (.add volatile-cal GregorianCalendar/HOUR_OF_DAY (- hours))
+                       [(.getTime volatile-cal) end])
          sort-by (partial sort-by #(.getTimestamp %))
          req (doto (DescribeSpotPriceHistoryRequest.)
                (.setStartTime start)

diff --git a/src/main/clj/lemur/core.clj b/src/main/clj/lemur/core.clj
@@ -902,7 +902,8 @@ calls launch              - take action (upload files, start cluster, etc)
     (cl-format true "~{~12<~a~>~}~%~
                      ~{~{~12<~a~>~}~%~}"
                     (take-nth 2 flds)
-                    details))
+                    details)
+    (flush))
   (quit))
 
 (defn- spot-price-history
@@ -918,7 +919,8 @@ calls launch              - take action (upload files, start cluster, etc)
     (cl-format true "~{~12<~a~>~}~%~
                      ~{~{~12<~a~>~}~%~}"
                     (take-nth 2 flds)
-                    details))
+                    details)
+    (flush))
   (quit))
 
 (defmacro when-local-test

diff --git a/src/test/clj/com/climate/shell_test.clj b/src/test/clj/com/climate/shell_test.clj
@@ -39,14 +39,15 @@
                   :env (merge-env {:FOO "bar"}))))))
 
 (deftest test-merge-env-2
-  (is (re-find
-        #"\[\"[\.\/\w]+\" \"bar\"\]"
-        (:out (sh "java" "-cp" (clj-main-jar) "clojure.main" "-e"
-              "(vector
-                 (get (System/getenv) \"JAVA_HOME\")
-                 (get (System/getenv) \"FOO\"))"
-              :err :pass
-              :env (merge-env {:FOO "bar"}))))))
+  (is (when-let [java-home (get (System/getenv) "JAVA_HOME")]
+        (.startsWith
+          (:out (sh "java" "-cp" (clj-main-jar) "clojure.main" "-e"
+                "(vector
+                   (get (System/getenv) \"JAVA_HOME\")
+                   (get (System/getenv) \"FOO\"))"
+                :err :pass
+                :env (merge-env {:FOO "bar"})))
+          (pr-str (vector java-home "bar"))))))
 
 (deftest test-sh-with-files
   (let [txt "some test text"