Merge pull request #317 from jonathannewman/maint/3.x/fix-logging

(maint) update logged? for better output, prepare for release

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.3 
+* update `logged?` to not emit an incorrect message when there are no matches, and clean up the output from multiple unexpected matches. 
+
 ## 3.3.2
 * this is a minor release changing a test utility
 * adds a new arity to `logged?` that removes the restriction that only one log line must match the pattern, adds printing to the function and repo documentation to make users aware of this single line match restriction

test/puppetlabs/trapperkeeper/testutils/logging.clj

@@ -318,6 +318,7 @@
               (swap! destination# conj event#))]
            ~@body)))))
 
+
 (s/defn ^{:always-validate true} logged?
   ([msg-or-pred] (logged? msg-or-pred nil nil))
   ([msg-or-pred maybe-level] (logged? msg-or-pred maybe-level nil))
@@ -329,9 +330,14 @@
    (let [match? (cond (ifn? msg-or-pred) msg-or-pred
                       (string? msg-or-pred) #(= msg-or-pred (:message %))
                       :else #(re-find msg-or-pred (:message %)))
-         one-element-if-specified? #(if (and (seq %) (or disable-single-line-match-restriction (empty? (rest %))))
-                                      true
-                                      (println "\n`logged?` warning: multiple log line matches found, but this arity expects only one match, returning false. Found matches: " % "\n"))
+         one-element-if-specified? (fn [items]
+                                     (if (seq items)
+                                       (if (or disable-single-line-match-restriction (empty? (rest items)))
+                                         true
+                                         (do
+                                           (println "\n`logged?` warning: multiple log line matches found, but this arity expects only one match, returning false. Found matches: \n" (pr-str (map :message items)) "\n")
+                                           false))
+                                       false))
          correct-level? #(or (nil? maybe-level) (= maybe-level (:level %)))]
      (->> (map event->map @*test-log-events*)
           (filter correct-level?)