 ;;       (drain! b #(t/is (= % [1]))
 ;;                 #(t/is (= % :oh-no)))
 ;;       (s/push! b 1)
-;;       (s/error! b :oh-no)
-;;       (s/end! b)
-;;       (s/on-end b done))))
+;;       (s/error! b (ex-info "oh noes" {})
+;;       (s/on-error b done))))
 
 ;; (t/deftest bus-plug
 ;;   (t/async done

;;    (let [pinc (m/pure s/event-stream-context inc)
;;          pval (m/pure s/event-stream-context 41)
;;          life (m/fapply pinc pval)]
;;      (t/is (s/event-stream? life))
;;      (drain! life #(do (t/is (= % [42]))
;;                        (done))))))


;;  (t/async done
;;    (let [s (s/from-coll [0 1 2])
;;          s2 (m/fmap inc s)]
;;      (t/is (s/observable? s))
;;      (t/is (s/observable? s2))
;;      (drain! s2 #(do (t/is (= % [1 2 3]))
;;                       (done))))))

